diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-04 01:55:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-04 01:55:33 (GMT) |
| commit | 6233a5210ef64ba31bbf0e867e03e9176e0aace9 (patch) | |
| tree | a6ae9f4ec4e25184cf85a0d78d02b1f16cb0cc4c /Documentation | |
| parent | 278863180a280304d6b7f4ad6f11c1a810463507 (diff) | |
| parent | a1748890dbfba4286c54fc9a3ce5786dfa25be33 (diff) | |
| download | git-6233a5210ef64ba31bbf0e867e03e9176e0aace9.zip git-6233a5210ef64ba31bbf0e867e03e9176e0aace9.tar.gz git-6233a5210ef64ba31bbf0e867e03e9176e0aace9.tar.bz2 | |
Merge branch 'maint-1.5.4' into maint
* maint-1.5.4:
filter-branch: Documentation fix.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-filter-branch.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 2a78549..6454e49 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" ' ------------------------------------------------------- |