diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-03-23 05:38:50 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-03-23 05:38:50 +0100 |
commit | aeb2aaa7712f7af8237d5bceb725a7db8c2d4620 (patch) | |
tree | 179be08e021c12d073818ca78bc63846b10da8a5 /pretty.c | |
parent | Merge branch 'js/maint-stash-index-copy' (diff) | |
parent | git-log: put space after commit mark (diff) | |
download | git-aeb2aaa7712f7af8237d5bceb725a7db8c2d4620.tar.xz git-aeb2aaa7712f7af8237d5bceb725a7db8c2d4620.zip |
Merge branch 'mg/rev-list-one-side-only'
* mg/rev-list-one-side-only:
git-log: put space after commit mark
t6007: test rev-list --cherry
log --cherry: a synonym
rev-list: documentation and test for --cherry-mark
revision.c: introduce --cherry-mark
rev-list/log: factor out revision mark generation
rev-list: --left/right-only are mutually exclusive
rev-list: documentation and test for --left/right-only
t6007: Make sure we test --cherry-pick
revlist.c: introduce --left/right-only for unsymmetric picking
Diffstat (limited to 'pretty.c')
-rw-r--r-- | pretty.c | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -876,11 +876,7 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, c->abbrev_parent_hashes.off; return 1; case 'm': /* left/right/bottom */ - strbuf_addch(sb, (commit->object.flags & BOUNDARY) - ? '-' - : (commit->object.flags & SYMMETRIC_LEFT) - ? '<' - : '>'); + strbuf_addstr(sb, get_revision_mark(NULL, commit)); return 1; case 'd': format_decoration(sb, commit); |