diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:51 -0700 |
| commit | d6465fb4fc705c5020bada0a3f9014dfcb2f4fd6 (patch) | |
| tree | 1ae15826fffb59a026d76904be6aa7164dd4ac12 /sequencer.c | |
| parent | Merge branch 'sb/blame-color' (diff) | |
| parent | sequencer: use configured comment character (diff) | |
| download | tgif-d6465fb4fc705c5020bada0a3f9014dfcb2f4fd6.tar.xz | |
Merge branch 'as/sequencer-customizable-comment-char'
Honor core.commentchar when preparing the list of commits to replay
in "rebase -i".
* as/sequencer-customizable-comment-char:
sequencer: use configured comment character
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 b89d5f2e34..16c1411054 100644 --- a/sequencer.c +++ b/sequencer.c @@ -4022,7 +4022,7 @@ static int make_script_with_merges(struct pretty_print_context *pp, entry = oidmap_get(&state.commit2label, &commit->object.oid); if (entry) - fprintf(out, "\n# Branch %s\n", entry->string); + fprintf(out, "\n%c Branch %s\n", comment_line_char, entry->string); else fprintf(out, "\n"); |