From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: Stefan Beller <sbeller@google•com>,
Nick Desaulniers <ndesaulniers@google•com>,
"git\@vger.kernel.org" <git@vger•kernel.org>
Subject: Re: fuzzy patch application
Date: Fri, 10 Feb 2017 14:53:00 -0800 [thread overview]
Message-ID: <xmqqlgtdiroz.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqy3xdisos.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Fri, 10 Feb 2017 14:31:31 -0800")
Junio C Hamano <gitster@pobox•com> writes:
> Making "am -3" default may also scare users who are not exactly
> comfortable with reading "git diff" output during a conflicted merge
> and resolving a conflict, but other than that there shouldn't be any
> downside.
Another obvious downside is that there are those of us who prefer to
run "am" without "-3" first to notice that the patch we expect to
apply cleanly does apply cleanly, which gives us a chance to catch
mistakes. I personally feel that as long as there is a configuration
that makes -3 a personal default (with --no-3way override from the
command line), it is a better design not to enable "-3" by default
for everybody. New people can first learn using both forms and then
after they got comfortable with resolving merges, they can choose to
flip the default for themselves.
next prev parent reply other threads:[~2017-02-10 22:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-10 19:20 fuzzy patch application Nick Desaulniers
2017-02-10 19:38 ` Junio C Hamano
2017-02-10 20:57 ` Jeff King
2017-02-10 21:37 ` Stefan Beller
2017-02-10 21:48 ` Jeff King
2017-02-10 22:31 ` Junio C Hamano
2017-02-10 22:53 ` Junio C Hamano [this message]
2017-02-10 22:56 ` Nick Desaulniers
2017-02-11 3:09 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlgtdiroz.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=ndesaulniers@google$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox