Andrew's git / gitweb.git / diff
?
Merge branch 'es/rebase-i-respect-core-commentchar' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:24 +0000 (15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 17 Oct 2013 22:45:24 +0000 (15:45 -0700)
* es/rebase-i-respect-core-commentchar:
rebase -i: fix cases ignoring core.commentchar

git-rebase--interactive.sh patch | blob | history
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 83d6d4676bc1cadcec5ea5889fcf4a0769ee8d31..9dfeb539536c55ba3958032d19c539be9ff4750f 100644 (file)
--- 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
                        ;;
                *)