diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:14:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-19 12:14:05 -0700 |
| commit | f944ec9aa53d22fb1d2f4e0b2974eb90c0cf3a15 (patch) | |
| tree | 0042a6a266598a7d5001f3e4a04e1fea62c9df75 /Documentation | |
| parent | Merge branch 'jc/color-diff-doc' (diff) | |
| parent | Documentation/githooks: Explain pre-rebase parameters (diff) | |
| download | tgif-f944ec9aa53d22fb1d2f4e0b2974eb90c0cf3a15.tar.xz | |
Merge branch 'wk/doc-pre-rebase'
* wk/doc-pre-rebase:
Documentation/githooks: Explain pre-rebase parameters
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/githooks.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index eab9b356cd..dc6693fe48 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 ~~~~~~~~~~~~~ |