git/templates, branch v1.4.2

Fix installation of templates on ancient systems.

2006-08-02T07:27:18Z

Do not use $(call) for 'shell quoting' paths, and pass DESTDIR down to the templates makefile. [jc: we have fixed the main Makefile long time ago, but somehow forgot to apply the same fix to templates Makefile.] Signed-off-by: Ramsay Allan Jones Signed-off-by: Junio C Hamano

templates/hooks--update: replace diffstat calls with git diff --stat

2006-07-08T10:11:16Z

Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano

pre-commit hook: complain about conflict markers.

2006-04-19T22:37:40Z

Several <<< or === or >>> characters at the beginning of a line is very likely to be leftover conflict markers from a failed automerge the user resolved incorrectly, so detect them. As usual, this can be defeated with "git commit --no-verify" if you really do want to have those files, just like changes that introduce trailing whitespaces. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2006-02-26T23:25:52Z

* maint: sample hooks template.

sample hooks template.

2006-02-26T23:16:41Z

These two sample hooks try to detect and use the corresponding commit hook from the same repository. However, they forgot to set up GIT_DIR for their own use, so was not in effect. Signed-off-by: Junio C Hamano

rebase: allow a hook to refuse rebasing.

2006-02-13T08:17:33Z

This lets a hook to interfere a rebase and help prevent certain branches from being rebased by mistake. A sample hook to show how to prevent a topic branch that has already been merged into publish branch. Signed-off-by: Junio C Hamano

Merge fixes up to GIT 1.1.6

2006-01-30T01:56:45Z

[PATCH] pre-commit sample hook: do not barf on the initial import

2006-01-29T22:52:16Z

The example hook barfs on the initial import. Ideally it should produce a diff from an empty tree, but for now let's stop at squelching the bogus error message. Often an initial import involves tons of badly formatted files from foreign SCM, so not complaining about them like this patch does might actually be a better idea than enforcing the "Perfect Patch" format on them. Signed-off-by: Junio C Hamano

sample update-hook: sanely handle a new branch head.

2006-01-25T01:38:06Z

Instead of showing all the history since the beginning of time leading to the the branch head, show only the changes this new branch brings to the world. This originally came from Linus and tested by Andreas Ericsson. Signed-off-by: Junio C Hamano

update-hook: Major overhaul (handling tags, mainly).

2006-01-25T01:27:33Z

This is the update hook we use in all our git-repos. It has some improvements over the original version, namely: * Don't send every commit since dawn of time when adding a new tag. * When updating an annotated tag, just send the diffs since the last tag. * Add diffstat output for 'normal' commits (top) and annotated tags (bottom). * Block un-annotated tags in shared repos. I'm a bit uncertain about that last one, but it demonstrates how to disallow updates of a ref which we use, so I kept it. Note that git-describe is needed for the "changes since last annotated tag" thing to work. Signed-off-by: Andreas Ericsson Signed-off-by: Junio C Hamano