diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:45:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:45:14 -0700 |
| commit | 8ddd9c18f323234e73e5f4c5d2675e355c68db7e (patch) | |
| tree | d23262091417e54cb29a3b7cebb128900310aa9b /Documentation/githooks.txt | |
| parent | 82b955c513e403adaf7b39ea621678bbce6b2ede (diff) | |
| parent | 0414acc3651a8e3ad938336b596e3de85e5d5d33 (diff) | |
| download | git-8ddd9c18f323234e73e5f4c5d2675e355c68db7e.tar.gz | |
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
Diffstat (limited to 'Documentation/githooks.txt')
| -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 4e0d2a08a1..4eed86b2a4 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 ~~~~~~~~~~~~~ |