Merge branch 'js/rebase-i-commentchar-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Nov 2016 19:23:17 +0000 (11:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Nov 2016 19:23:17 +0000 (11:23 -0800)
"git rebase -i" did not work well with core.commentchar
configuration variable for two reasons, both of which have been
fixed.

* js/rebase-i-commentchar-fix:
rebase -i: handle core.commentChar=auto
stripspace: respect repository config
rebase -i: highlight problems with core.commentchar

1  2 
git-rebase--interactive.sh
t/t3404-rebase-interactive.sh
Simple merge
Simple merge