From a1748890dbfba4286c54fc9a3ce5786dfa25be33 Mon Sep 17 00:00:00 2001 From: Florian Ragwitz Date: Wed, 30 Apr 2008 09:47:43 +0200 Subject: filter-branch: Documentation fix. It's --msg-filter, not --message-filter. Signed-off-by: Florian Ragwitz Signed-off-by: Junio C Hamano --- Documentation/git-filter-branch.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 543a1cf105..ee0f0531d4 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -242,12 +242,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" ' ------------------------------------------------------- -- cgit v1.2.3 From 278863180a280304d6b7f4ad6f11c1a810463507 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 2 May 2008 10:05:36 -0400 Subject: checkout: don't rfc2047-encode oneline on detached HEAD When calling pretty_print_commit, there is an implicit assumption that passing in a non-NULL "subject" variable for oneline or email formats means that the output is part of a subject and therefore "subject" to rfc2047 encoding. This is not the desired effect when reporting the movement of detached HEAD. Signed-off-by: Junio C Hamano --- builtin-checkout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin-checkout.c b/builtin-checkout.c index 7deb504837..cf9875c13d 100644 --- a/builtin-checkout.c +++ b/builtin-checkout.c @@ -142,7 +142,7 @@ static void describe_detached_head(char *msg, struct commit *commit) struct strbuf sb; strbuf_init(&sb, 0); parse_commit(commit); - pretty_print_commit(CMIT_FMT_ONELINE, commit, &sb, 0, "", "", 0, 0); + pretty_print_commit(CMIT_FMT_ONELINE, commit, &sb, 0, NULL, NULL, 0, 0); fprintf(stderr, "%s %s... %s\n", msg, find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV), sb.buf); strbuf_release(&sb); -- cgit v1.2.3