From: Yuri D'Elia <wavexx@thregr.org>
To: git@vger.kernel.org
Subject: Set default strategy options for merge/rebase
Date: Thu, 17 Oct 2019 20:48:30 +0200 [thread overview]
Message-ID: <87eezbi4xt.fsf@wavexx.thregr.org> (raw)
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!
reply other threads:[~2019-10-17 18:48 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eezbi4xt.fsf@wavexx.thregr.org \
--to=wavexx@thregr.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).