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

1  2 
git-rebase--interactive.sh
Simple merge