diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-08-20 01:14:47 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-20 01:14:47 +0200 |
commit | 6cceea19eb6b86a4a293c92fe9653ccc8bb71526 (patch) | |
tree | f6982b6db7ab3723fd4b5d1b4db3b44f8affd759 /sequencer.c | |
parent | Merge branch 'rs/preserve-merges-unused-code-removal' (diff) | |
parent | sequencer: avoid garbled merge machinery messages due to commit labels (diff) | |
download | git-6cceea19eb6b86a4a293c92fe9653ccc8bb71526.tar.xz git-6cceea19eb6b86a4a293c92fe9653ccc8bb71526.zip |
Merge branch 'en/sequencer-merge-labels'
The commit labels used to explain each side of conflicted hunks
placed by the sequencer machinery have been made more readable by
humans.
* en/sequencer-merge-labels:
sequencer: avoid garbled merge machinery messages due to commit labels
Diffstat (limited to 'sequencer.c')
-rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index cc3f8fa88e..8a25e28cad 100644 --- a/sequencer.c +++ b/sequencer.c @@ -355,7 +355,7 @@ static int get_message(struct commit *commit, struct commit_message *out) subject_len = find_commit_subject(out->message, &subject); out->subject = xmemdupz(subject, subject_len); - out->label = xstrfmt("%s... %s", abbrev, out->subject); + out->label = xstrfmt("%s (%s)", abbrev, out->subject); out->parent_label = xstrfmt("parent of %s", out->label); return 0; |