diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-03 22:15:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-03 22:15:09 -0700 |
| commit | 471793f91e4bd61bb809045c7088a30ee1305a19 (patch) | |
| tree | 59ac36f8958245a95393cc9147942ed8db50fc01 | |
| parent | Documentation: hooks: fix missing verb in pre-applypatch description (diff) | |
| parent | Merge branch 'maint-1.5.4' into maint (diff) | |
| download | tgif-471793f91e4bd61bb809045c7088a30ee1305a19.tar.xz | |
Merge branch 'maint'
* maint:
checkout: don't rfc2047-encode oneline on detached HEAD
filter-branch: Documentation fix.
| -rw-r--r-- | Documentation/git-filter-branch.txt | 4 | ||||
| -rw-r--r-- | builtin-checkout.c | 2 |
2 files changed, 3 insertions, 3 deletions
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" ' ------------------------------------------------------- diff --git a/builtin-checkout.c b/builtin-checkout.c index 14b2fe7760..10ec137cce 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); |