diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-03-19 16:07:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-19 16:07:29 -0700 |
| commit | 947ab826679af3ad71f1bd69391deca3bc6edad9 (patch) | |
| tree | 7a69484c0bf6020bb62b3b2fad6e2d90e4fdaff3 /githooks.html | |
| parent | fa156ead3ef3991c2ca287ac33572a01ac404180 (diff) | |
| download | git-htmldocs-947ab826679af3ad71f1bd69391deca3bc6edad9.tar.gz | |
Autogenerated HTML docs for v1.8.2-61-g7b9a4
Diffstat (limited to 'githooks.html')
| -rw-r--r-- | githooks.html | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/githooks.html b/githooks.html index 14d94ed21..bc81d4e2c 100644 --- a/githooks.html +++ b/githooks.html @@ -861,8 +861,11 @@ the outcome of <em>git commit</em>.</p></div> </div>
<div class="sect2">
<h3 id="_pre_rebase">pre-rebase</h3>
-<div class="paragraph"><p>This hook is called by <em>git rebase</em> and can be used to prevent a branch
-from getting rebased.</p></div>
+<div class="paragraph"><p>This hook is called by <em>git rebase</em> 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.</p></div>
</div>
<div class="sect2">
<h3 id="_post_checkout">post-checkout</h3>
@@ -1093,7 +1096,7 @@ processed by rebase.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-01 14:13:12 PST
+Last updated 2013-03-19 16:06:22 PDT
</div>
</div>
</body>
|