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

diff --combined Documentation/githooks.txt
index 4e0d2a08a11a2dd0af3bd77c5fd0041ea7e1d97e,e711cf1a0154a37aae6644f654c5cedbd83e11aa..4eed86b2a44f0cac8d963ec6c9ed88e4a069bc4c
--- 1/Documentation/githooks.txt
--- 2/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@@ -140,9 -140,11 +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
  ~~~~~~~~~~~~~
@@@ -336,7 -338,7 +338,7 @@@ preceding SP is also omitted.  Currentl
  'extra-info'.
  
  The hook always runs after the automatic note copying (see
 -"notes.rewrite.<command>" in linkgit:git-config.txt) has happened, and
 +"notes.rewrite.<command>" in linkgit:git-config.txt[1]) has happened, and
  thus has access to these notes.
  
  The following command-specific comments apply: