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
This commit is contained in:
6
pretty.c
6
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);
|
||||
|
||||
Reference in New Issue
Block a user