diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-10-10 15:31:42 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-10-10 15:31:42 +0000 |
| commit | a476efaaca349e01dfbc4e1009ab534aa511479b (patch) | |
| tree | b0f05e148f284deb9030edaf25419f9f704adb32 /githooks.html | |
| parent | 7cc912979feaec3ed65d4491e129ed48507f6994 (diff) | |
| download | git-htmldocs-a476efaaca349e01dfbc4e1009ab534aa511479b.tar.gz | |
Autogenerated HTML docs for v1.6.0.2-514-g23abd3
Diffstat (limited to 'githooks.html')
| -rw-r--r-- | githooks.html | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/githooks.html b/githooks.html index 416c106f3..c9bf5765a 100644 --- a/githooks.html +++ b/githooks.html @@ -383,12 +383,12 @@ to modify the commit message.</p></div> default log message, and before the editor is started.</p></div>
<div class="para"><p>It takes one to three parameters. The first is the name of the file
that the commit log message. The second is the source of the commit
-message, and can be: <tt>message</tt> (if a <tt>\-m</tt> or <tt>\-F</tt> option was
-given); <tt>template</tt> (if a <tt>\-t</tt> option was given or the
+message, and can be: <tt>message</tt> (if a <tt>-m</tt> or <tt>-F</tt> option was
+given); <tt>template</tt> (if a <tt>-t</tt> option was given or the
configuration option <tt>commit.template</tt> is set); <tt>merge</tt> (if the
commit is a merge or a <tt>.git/MERGE_MSG</tt> file exists); <tt>squash</tt>
(if a <tt>.git/SQUASH_MSG</tt> file exists); or <tt>commit</tt>, followed by
-a commit SHA1 (if a <tt>\-c</tt>, <tt>\-C</tt> or <tt>--amend</tt> option was given).</p></div>
+a commit SHA1 (if a <tt>-c</tt>, <tt>-C</tt> or <tt>--amend</tt> option was given).</p></div>
<div class="para"><p>If the exit status is non-zero, <em>git-commit</em> will abort.</p></div>
<div class="para"><p>The purpose of the hook is to edit the message file in place, and
it is not suppressed by the <tt>--no-verify</tt> option. A non-zero exit
@@ -418,6 +418,11 @@ parameter, and is invoked after a commit is made.</p></div> <div class="para"><p>This hook is meant primarily for notification, and cannot affect
the outcome of <em>git-commit</em>.</p></div>
</div>
+<h2 id="_pre_rebase">pre-rebase</h2>
+<div class="sectionbody">
+<div class="para"><p>This hook is called by <em>git-rebase</em> and can be used to prevent a branch
+from getting rebased.</p></div>
+</div>
<h2 id="_post_checkout">post-checkout</h2>
<div class="sectionbody">
<div class="para"><p>This hook is invoked when a <em>git-checkout</em> is run after having updated the
@@ -574,7 +579,7 @@ to abort.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-09-19 06:33:21 UTC
+Last updated 2008-10-10 15:30:52 UTC
</div>
</div>
</body>
|