From: Junio C Hamano Date: Wed, 23 Nov 2016 19:23:17 +0000 (-0800) Subject: Merge branch 'js/rebase-i-commentchar-fix' X-Git-Tag: v2.11.0-rc3~3 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bd53f38d52b87340ad791290d700c5c7e8587f23?ds=inline;hp=--cc Merge branch 'js/rebase-i-commentchar-fix' "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 --- bd53f38d52b87340ad791290d700c5c7e8587f23