Skip to content

Commit 8ddd9c1

Browse files
committed
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
2 parents 82b955c + 0414acc commit 8ddd9c1

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Documentation/githooks.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,11 @@ the outcome of 'git commit'.
140140
pre-rebase
141141
~~~~~~~~~~
142142

143-
This hook is called by 'git rebase' and can be used to prevent a branch
144-
from getting rebased.
145-
143+
This hook is called by 'git rebase' and can be used to prevent a
144+
branch from getting rebased. The hook may be called with one or
145+
two parameters. The first parameter is the upstream from which
146+
the series was forked. The second parameter is the branch being
147+
rebased, and is not set when rebasing the current branch.
146148

147149
post-checkout
148150
~~~~~~~~~~~~~

0 commit comments

Comments
 (0)