Minor correction to what I said here: On Thu, Feb 3, 2022, at 6:39 PM, Greg Hurrell wrote: > > That gave me the idea of moving the `include.path` setting higher up in > the file, to see if `git checkout` would consult that value first, but > it doesn't work; `git config merge.conflictStyle` shows the value from > the file indicated in `include.path` It only did that because I forgot to remove the original `include.path` from the bottom of the config. Once I removed that, `git config` showed the value from ~/.gitconfig. `git checkout` behaved the same either way. Greg
