* Set default strategy options for merge/rebase
@ 2019-10-17 18:48 Yuri D'Elia
0 siblings, 0 replies; only message in thread
From: Yuri D'Elia @ 2019-10-17 18:48 UTC (permalink / raw)
To: git
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!
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2019-10-17 18:48 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-17 18:48 Set default strategy options for merge/rebase Yuri D'Elia
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).