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

Change Default merge strategy options

From
DLDaniel Lopez <dlopez@csscorporate.com>
Date
Oct 13, 2016, 15:57 UTC
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 |   
Next: Jeff King
Message 1 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.