On 11/12/17 14:13, Phillip Wood wrote: > From: Phillip Wood <phillip.w...@dunelm.org.uk> > > Load default values for message cleanup, gpg signing of commits and > basic diff configuration in preparation for committing without forking > 'git commit'. Note that we interpret commit.cleanup=scissors to mean > COMMIT_MSG_CLEANUP_SPACE to be consistent with 'git commit'. > > The sequencer should probably have been calling > git_diff_basic_config() before as it creates a patch when there are > conflicts. The shell version uses 'diff-index' to create the patch so
s/diff-index/diff-tree/
