From: Daniel Lopez <dlopez@csscorporate.com>
Date: Thu, 13 Oct 2016 15:57:55 GMT
Subject: Change Default merge strategy options
Message-ID: <HE1PR0101MB218771966DAC7634B9735634BDDC0@HE1PR0101MB2187.eurprd01.prod.exchangelabs.com>
In-Reply-To: <HE1PR0101MB2187D29367CB67F42373647CBDDC0@HE1PR0101MB2187.eurprd01.prod.exchangelabs.com>

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 |