From: Junio C Hamano Date: Sun, 18 Jan 2009 07:04:40 +0000 (-0800) Subject: Merge branch 'maint' X-Git-Tag: v1.6.2-rc0~144 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/58f37f3c07ef4869f88c79b61f11829bebf7bf40?ds=sidebyside;hp=-c Merge branch 'maint' * maint: Update draft release notes for 1.6.1.1 builtin-fsck: fix off by one head count t5540: clarify that http-push does not handle packed-refs on the remote http-push: when making directories, have a trailing slash in the path name http-push: fix off-by-path_len Documentation: let asciidoc align related options githooks.txt: add missing word builtin-commit.c: do not remove COMMIT_EDITMSG --- 58f37f3c07ef4869f88c79b61f11829bebf7bf40 diff --combined Documentation/githooks.txt index e4d61d5562,28a8abcf52..1fd512bca2 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@@ -15,7 -15,7 +15,7 @@@ DESCRIPTIO Hooks are little scripts you can place in `$GIT_DIR/hooks` directory to trigger action at certain points. When -'git-init' is run, a handful example hooks are copied in the +'git-init' is run, a handful of example hooks are copied into the `hooks` directory of the new repository, but by default they are all disabled. To enable a hook, rename it by removing its `.sample` suffix. @@@ -90,7 -90,7 +90,7 @@@ This hook is invoked by 'git-commit' ri default log message, and before the editor is started. It takes one to three parameters. The first is the name of the file - that the commit log message. The second is the source of the commit + that contains the commit log message. The second is the source of the commit message, and can be: `message` (if a `-m` or `-F` option was given); `template` (if a `-t` option was given or the configuration option `commit.template` is set); `merge` (if the