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
maint
Junio C Hamano 2013-03-25 13:45:14 -07:00
commit 8ddd9c18f3
1 changed files with 5 additions and 3 deletions

View File

@ -140,9 +140,11 @@ the outcome of 'git commit'.
pre-rebase pre-rebase
~~~~~~~~~~ ~~~~~~~~~~


This hook is called by 'git rebase' and can be used to prevent a branch This hook is called by 'git rebase' and can be used to prevent a
from getting rebased. 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 post-checkout
~~~~~~~~~~~~~ ~~~~~~~~~~~~~