From: Junio C Hamano Date: Sun, 4 May 2008 01:55:33 +0000 (-0700) Subject: Merge branch 'maint-1.5.4' into maint X-Git-Tag: v1.5.5.2~9 X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/6233a5210ef64ba31bbf0e867e03e9176e0aace9?hp=278863180a280304d6b7f4ad6f11c1a810463507 Merge branch 'maint-1.5.4' into maint * maint-1.5.4: filter-branch: Documentation fix. --- diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 2a78549be5..6454e49bf2 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/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" ' -------------------------------------------------------