git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Change Default merge strategy options

From
Jeff King <peff@peff.net>
Date
Oct 14, 2016, 19:18 UTC
Message-ID
<20161014191827.qf43nk3bum7gy4dj@sigill.intra.peff.net>
In-Reply-To
<HE1PR0101MB218771966DAC7634B9735634BDDC0@HE1PR0101MB2187.eurprd01.prod.exchangelabs.com>
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
Previous: Daniel Lopez
Message 2 of 2 in “Change Default merge strategy options”
  1. Daniel LopezOct 13, 2016
  2. Jeff KingOct 14, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.