On Thu, Oct 13, 2016 at 03:57:55PM +0000, Daniel Lopez wrote: > How to use 'git config --global' to set default strategy like > recursive.
I don't think there is a way to do so, though note that the default strategy is already "recursive". You can set individual file merge drivers with gitattributes, but I don't know of a way to set the overall strategy. > Example: > Currently , when we want to enforce a specific strategic we need to > include its reference on the command line : > git.exe merge --strategy=recursive --strategy-option=ignore-all-space > dev-local Some strategy options have their own config already (like merge.renormalize). I guess in theory we could grow config options for the other ones, though I think config for "strategy and its options" might be more elegant. -Peff
