summaryrefslogtreecommitdiffstats
path: root/githooks.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-19 16:07:29 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-19 16:07:29 -0700
commit947ab826679af3ad71f1bd69391deca3bc6edad9 (patch)
tree7a69484c0bf6020bb62b3b2fad6e2d90e4fdaff3 /githooks.txt
parentfa156ead3ef3991c2ca287ac33572a01ac404180 (diff)
downloadgit-htmldocs-947ab826679af3ad71f1bd69391deca3bc6edad9.tar.gz
Autogenerated HTML docs for v1.8.2-61-g7b9a4
Diffstat (limited to 'githooks.txt')
-rw-r--r--githooks.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/githooks.txt b/githooks.txt
index eab9b356c..dc6693fe4 100644
--- a/githooks.txt
+++ b/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
~~~~~~~~~~~~~