Autogenerated HTML docs for v1.5.5.1-125-gc697a

diff --git a/git-filter-branch.html b/git-filter-branch.html
index 42ad7f297b63cf388634425f890adf68ba92d462..0628c213a750bacfd4be5e06a1616c1725eda4a9 100644 (file)
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -545,12 +545,12 @@ parameters.  Note that this handles merges properly! In case Darl
 committed a merge between P1 and P2, it will be propagated properly\r
 and all children of the merge will become merge commits with P1,P2\r
 as their parents instead of the merge commit.</p>\r
-<p>You can rewrite the commit log messages using <tt>--message-filter</tt>.  For\r
+<p>You can rewrite the commit log messages using <tt>--msg-filter</tt>.  For\r
 example, <tt>git-svn-id</tt> strings in a repository created by <tt>git-svn</tt> can\r
 be removed this way:</p>\r
 <div class="listingblock">\r
 <div class="content">\r
-<pre><tt>git filter-branch --message-filter '\r
+<pre><tt>git filter-branch --msg-filter '\r
         sed -e "/^git-svn-id:/d"\r
 '</tt></pre>\r
 </div></div>\r
@@ -605,7 +605,7 @@ and the git list &lt;git@vger.kernel.org&gt;</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 23-Mar-2008 09:40:59 UTC\r
+Last updated 04-May-2008 06:41:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/git-filter-branch.txt b/git-filter-branch.txt
index 2a78549be597675cd9a271181c9b142450b311e5..6454e49bf2805fcf0a000ed6f96ff9f73d718299 100644 (file)
--- a/git-filter-branch.txt
+++ b/git-filter-branch.txt
@@ -243,12 +243,12 @@ committed a merge between P1 and P2, it will be propagated properly
 and all children of the merge will become merge commits with P1,P2
 as their parents instead of the merge commit.
 
-You can rewrite the commit log messages using `--message-filter`.  For
+You can rewrite the commit log messages using `--msg-filter`.  For
 example, `git-svn-id` strings in a repository created by `git-svn` can
 be removed this way:
 
 -------------------------------------------------------
-git filter-branch --message-filter '
+git filter-branch --msg-filter '
        sed -e "/^git-svn-id:/d"
 '
 -------------------------------------------------------

diff --git a/hooks.html b/hooks.html
index 5fbc71a1e01f0ccf38de4109a0d7db19f40f9365..fd407d49a695ecdf30c76c05ceff4c71d181d38c 100644 (file)
--- a/hooks.html
+++ b/hooks.html
@@ -286,10 +286,10 @@ the commit after inspecting the message file.</p>
 </div>\r
 <h2>pre-applypatch</h2>\r
 <div class="sectionbody">\r
-<p>This hook is invoked by <tt>git-am</tt>.  It takes no parameter,\r
-and is invoked after the patch is applied, but before a commit\r
-is made.  Exiting with non-zero status causes the working tree\r
-after application of the patch not committed.</p>\r
+<p>This hook is invoked by <tt>git-am</tt>.  It takes no parameter, and is\r
+invoked after the patch is applied, but before a commit is made.</p>\r
+<p>If it exits with non-zero status, then the working tree will not be\r
+committed after applying the patch.</p>\r
 <p>It can be used to inspect the current working tree and refuse to\r
 make a commit if it does not pass certain test.</p>\r
 <p>The default <em>pre-applypatch</em> hook, when enabled, runs the\r
@@ -508,7 +508,7 @@ to abort.</p>
 </div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 21-Apr-2008 00:47:34 UTC\r
+Last updated 04-May-2008 06:41:00 UTC\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/hooks.txt b/hooks.txt
index 44fbe58f20701291c0a43779fe0db826185f4322..1283ab4daac1cd929605a51f50d0a3b9beb11dc9 100644 (file)
--- a/hooks.txt
+++ b/hooks.txt
@@ -28,10 +28,11 @@ The default 'applypatch-msg' hook, when enabled, runs the
 pre-applypatch
 --------------
 
-This hook is invoked by `git-am`.  It takes no parameter,
-and is invoked after the patch is applied, but before a commit
-is made.  Exiting with non-zero status causes the working tree
-after application of the patch not committed.
+This hook is invoked by `git-am`.  It takes no parameter, and is
+invoked after the patch is applied, but before a commit is made.
+
+If it exits with non-zero status, then the working tree will not be
+committed after applying the patch.
 
 It can be used to inspect the current working tree and refuse to
 make a commit if it does not pass certain test.