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

Set default strategy options for merge/rebase

From
YDYuri D'Elia <wavexx@thregr.org>
Date
Oct 17, 2019, 18:48 UTC
Message-ID
<87eezbi4xt.fsf@wavexx.thregr.org>

Is it (or would it be) possible to set the default strategy and strategy options as provided by merge/rebase ``-s`` and ``-X`` in gitconfig?

I found myself comparing several conflicts using recursive's -Xpatience, and in some cases the difference is quite staggering, changing from a jumbled mess to a compact and readable diff.

I'd love to be able to set it as a default to play around more (without aliasing, that is).

It's also unclear to me from the documentation of git merge whether -Xdiff-algorithm=? is an exception to the default diff algorithm (diff.algorithm) or if that's completely independent setting meaning that merge always ignores diff.algorithm to begin with.

And also, is -Xpatience just a shortcut to -Xdiff-algorithm=patience?
Thanks!
Message 1 of 1 in “Set default strategy options for merge/rebase”
  1. Yuri D'EliaOct 17, 2019

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.