From: Junio C Hamano Date: Mon, 25 Mar 2013 20:45:14 +0000 (-0700) Subject: Merge branch 'wk/doc-pre-rebase' into maint-1.8.1 X-Git-Tag: v1.8.1.6~25 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8ddd9c18f323234e73e5f4c5d2675e355c68db7e?ds=inline;hp=-c Merge branch 'wk/doc-pre-rebase' into maint-1.8.1 The arguments given to pre-rebase hook were not documented. * wk/doc-pre-rebase: Documentation/githooks: Explain pre-rebase parameters --- 8ddd9c18f323234e73e5f4c5d2675e355c68db7e diff --combined Documentation/githooks.txt index 4e0d2a08a1,e711cf1a01..4eed86b2a4 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@@ -140,9 -140,11 +140,11 @@@ the outcome of 'git commit' pre-rebase ~~~~~~~~~~ - This hook is called by 'git rebase' and can be used to prevent a branch - from getting rebased. - + This hook is called by 'git rebase' and can be used to prevent a + branch from getting rebased. The hook may be called with one or + two parameters. The first parameter is the upstream from which + the series was forked. The second parameter is the branch being + rebased, and is not set when rebasing the current branch. post-checkout ~~~~~~~~~~~~~ @@@ -336,7 -338,7 +338,7 @@@ preceding SP is also omitted. Currentl 'extra-info'. The hook always runs after the automatic note copying (see -"notes.rewrite." in linkgit:git-config.txt) has happened, and +"notes.rewrite." in linkgit:git-config.txt[1]) has happened, and thus has access to these notes. The following command-specific comments apply: