From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 Feb 2013 23:25:19 +0000 (-0800)
Subject: Merge branch 'jk/rebase-i-comment-char'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=00abd715ab0a2cd69f9d27ea15c5440002f970b8;p=git.git

Merge branch 'jk/rebase-i-comment-char'

Finishing touches to the earlier core.commentchar topic to cover
"rebase -i" as well.

* jk/rebase-i-comment-char:
  rebase -i: respect core.commentchar
---

00abd715ab0a2cd69f9d27ea15c5440002f970b8
diff --cc git-rebase--interactive.sh
index 8ed7fccc1,5db9e2d3f..048a140a6
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -879,9 -878,9 +883,9 @@@ git rev-list $merges_option --pretty=on
  while read -r shortsha1 rest
  do
  
 -	if test -z "$keep_empty" && is_empty_commit $shortsha1
 +	if test -z "$keep_empty" && is_empty_commit $shortsha1 && ! is_merge_commit $shortsha1
  	then
- 		comment_out="# "
+ 		comment_out="$comment_char "
  	else
  		comment_out=
  	fi