From: Junio C Hamano Date: Sun, 4 May 2008 06:41:23 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.5.1-125-gc697a X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a31092a704a554fa909c79c1fa4a482938f7bc17;p=git.git Autogenerated HTML docs for v1.5.5.1-125-gc697a --- diff --git a/git-filter-branch.html b/git-filter-branch.html index 42ad7f297..0628c213a 100644 --- 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 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"
 '
@@ -605,7 +605,7 @@ and the git list <git@vger.kernel.org>

diff --git a/git-filter-branch.txt b/git-filter-branch.txt index 2a78549be..6454e49bf 100644 --- 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 5fbc71a1e..fd407d49a 100644 --- a/hooks.html +++ b/hooks.html @@ -286,10 +286,10 @@ the commit after inspecting the message file.

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.

The default pre-applypatch hook, when enabled, runs the @@ -508,7 +508,7 @@ to abort.

diff --git a/hooks.txt b/hooks.txt index 44fbe58f2..1283ab4da 100644 --- 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.