{"thread":{"id":"44295","subject":"Change Default merge strategy options","startedAt":"2016-10-14T01:35:50Z","lastAt":"2016-10-16T00:33:32Z","messageCount":2,"participants":["Daniel Lopez","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"304098","messageId":"HE1PR0101MB218771966DAC7634B9735634BDDC0@HE1PR0101MB2187.eurprd01.prod.exchangelabs.com","threadId":"44295","inReplyTo":"HE1PR0101MB2187D29367CB67F42373647CBDDC0@HE1PR0101MB2187.eurprd01.prod.exchangelabs.com","subject":"Change Default merge strategy options","fromName":"Daniel Lopez","fromEmail":"dlopez@csscorporate.com","sentAt":"2016-10-13T15:57:55Z","receivedAt":"2016-10-14T01:35:50Z","isPatch":false,"sender":{"key":"dlopez@csscorporate.com","avatar":null},"body":"Hi,\n\nHow to use 'git config --global' to set default strategy like recursive.\n\n\nExample:\nCurrently , when we want to enforce a specific strategic we need to include  its reference on the command line : \ngit.exe merge --strategy=recursive --strategy-option=ignore-all-space dev-local\n\n\nwe would like to define it as the default strategic to follow and be able to simplify the command line to:\n\ngit.exe merge dev-fix1.3-local \n\nUsing alias is not an option as the git is being called from TortoiseGit (our current gui tool).\n\n\nDaniel Lopez\nConcept Developer\n\nTel: +351 289 100683 | Email: dlopez@csscorporate.com | www.csscorporate.com |   \n\n"},{"id":"304189","messageId":"20161014191827.qf43nk3bum7gy4dj@sigill.intra.peff.net","threadId":"44295","inReplyTo":"HE1PR0101MB218771966DAC7634B9735634BDDC0@HE1PR0101MB2187.eurprd01.prod.exchangelabs.com","subject":"Re: Change Default merge strategy options","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2016-10-14T19:18:27Z","receivedAt":"2016-10-16T00:33:32Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Oct 13, 2016 at 03:57:55PM +0000, Daniel Lopez wrote:\n\n> How to use 'git config --global' to set default strategy like\n> recursive.\n\nI don't think there is a way to do so, though note that the default\nstrategy is already \"recursive\". You can set individual file merge\ndrivers with gitattributes, but I don't know of a way to set the overall\nstrategy.\n\n> Example:\n> Currently , when we want to enforce a specific strategic we need to\n> include  its reference on the command line : \n> git.exe merge --strategy=recursive --strategy-option=ignore-all-space dev-local\n\nSome strategy options have their own config already (like\nmerge.renormalize). I guess in theory we could grow config options for\nthe other ones, though I think config for \"strategy and its options\"\nmight be more elegant.\n\n-Peff\n"}]}