summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-22 21:38:50 -0700
committerJunio C Hamano <gitster@pobox.com>2011-03-22 21:38:50 -0700
commitaeb2aaa7712f7af8237d5bceb725a7db8c2d4620 (patch)
tree179be08e021c12d073818ca78bc63846b10da8a5 /pretty.c
parent281ee1d0c2c3f73bdc9012a5ac52feff97f72acd (diff)
parentb1b47554ae889ca76b66349819c9b95a8be5f646 (diff)
downloadgit-aeb2aaa7712f7af8237d5bceb725a7db8c2d4620.tar.gz
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.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/pretty.c b/pretty.c
index 65d20a7a2e..e1d8a8f414 100644
--- a/pretty.c
+++ b/pretty.c
@@ -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);