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

* es/rebase-i-respect-core-commentchar: rebase -i: fix cases ignoring core.commentchar
2013-10-17 15:45:24 -07:00
parent ddeaf7ef0d 7bca7afeff
commit 6f89c2714a
1 changed files with 1 additions and 1 deletions
--- 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
 			;;
 		*)