From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 17 Oct 2013 22:45:24 +0000 (-0700)
Subject: Merge branch 'es/rebase-i-respect-core-commentchar' into maint
X-Git-Tag: v1.8.4.2~22
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6f89c2714a557ad3630ed005f4680193a638ce3f?hp=ddeaf7ef0d23519cb810542978da54dd89d6fb73

Merge branch 'es/rebase-i-respect-core-commentchar' into maint

* es/rebase-i-respect-core-commentchar:
rebase -i: fix cases ignoring core.commentchar
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 83d6d4676b..9dfeb53953 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -671,7 +671,7 @@ skip_unnecessary_picks () {
 				;;
 			esac
 			;;
-		3,#*|3,)
+		3,"$comment_char"*|3,)
 			# copy comments
 			;;
 		*)