threads / discuss / 44295

Change Default merge strategy options

Subject: Change Default merge strategy options

## tl;dr

2 messages between Oct 14, 2016 and Oct 16, 2016.

replies: 1people: 2as markdown or json

Daniel Lopez· Oct 13, 2016, 15:57 UTC · lore

Hi,

How to use 'git config --global' to set default strategy like recursive.

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

we would like to define it as the default strategic to follow and be able to simplify the command line to:

git.exe merge dev-fix1.3-local

Using alias is not an option as the git is being called from TortoiseGit (our current gui tool).

Daniel Lopez Concept Developer

Tel: +351 289 100683 | Email: dlopez@csscorporate.com | www.csscorporate.com |

Jeff King· Oct 14, 2016, 19:18 UTC · re: Daniel Lopez · lore

Re: Change Default merge strategy options

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