Re: [PATCH v4 0/3] add additional config settings for merge

2018-05-02 Thread Elijah Newren
Hi Ben, Thanks for your persistence. On Wed, May 2, 2018 at 9:01 AM, Ben Peart wrote: > This version incorporates Elijah's fixup patch and is now based on > en/rename-directory-detection in next. en/rename-directory-detection was in master but reverted. en/rename-directory-detection-reboot is t

[PATCH v4 0/3] add additional config settings for merge

2018-05-02 Thread Ben Peart
This version incorporates Elijah's fixup patch and is now based on en/rename-directory-detection in next. Base Ref: en/rename-directory-detection Web-Diff: https://github.com/benpeart/git/commit/16b175c25f Checkout: git fetch https://github.com/benpeart/git merge-renames-v4 && git checkout 16b175