diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:46:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:46:42 -0700 |
| commit | f7b1ad870c46c53685ef83efbfd7d9ca1983a191 (patch) | |
| tree | 3d37b13993699ccd8f1bebc1b4b93546da3e9bda /Documentation/githooks.txt | |
| parent | 04fe1184fd0611bf26785b365dd344b8f7d72861 (diff) | |
| parent | 7c1017d2d56112b88be2b6fa6d2a57a12ee2ffb4 (diff) | |
| download | git-f7b1ad870c46c53685ef83efbfd7d9ca1983a191.tar.gz | |
Merge branch 'maint-1.8.1' into maint
* maint-1.8.1:
bundle: Add colons to list headings in "verify"
bundle: Fix "verify" output if history is complete
Documentation: filter-branch env-filter example
git-filter-branch.txt: clarify ident variables usage
git-compat-util.h: Provide missing netdb.h definitions
describe: Document --match pattern format
Documentation/githooks: Explain pre-rebase parameters
update-index: list supported idx versions and their features
diff-options: unconfuse description of --color
read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
index-format.txt: mention of v4 is missing in some places
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 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 ~~~~~~~~~~~~~ |