summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2013-02-23 10:27:39 -0500
committerJunio C Hamano <gitster@pobox.com>2013-02-24 00:13:11 -0800
commit0414acc3651a8e3ad938336b596e3de85e5d5d33 (patch)
tree302085e19c4c10c657eaf00adbfbe0f476669b43 /Documentation
parentdff9f8835f2f2820c4e7109d242cb06b39f7d065 (diff)
downloadgit-0414acc3651a8e3ad938336b596e3de85e5d5d33.tar.gz
Documentation/githooks: Explain pre-rebase parameters
Descriptions borrowed from templates/hooks--pre-rebase.sample. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/githooks.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b9003fed24..e711cf1a01 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -140,9 +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
~~~~~~~~~~~~~