summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-07-24 21:50:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-24 21:50:51 (GMT)
commitd6465fb4fc705c5020bada0a3f9014dfcb2f4fd6 (patch)
tree1ae15826fffb59a026d76904be6aa7164dd4ac12 /sequencer.c
parentb8d93072bbfd69264001b26cbe850563e0bf4021 (diff)
parent02cfd149207f65dd8462ed90c505c90af8655fc9 (diff)
downloadgit-d6465fb4fc705c5020bada0a3f9014dfcb2f4fd6.zip
git-d6465fb4fc705c5020bada0a3f9014dfcb2f4fd6.tar.gz
git-d6465fb4fc705c5020bada0a3f9014dfcb2f4fd6.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c
index b89d5f2..16c1411 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");