From: Junio C Hamano <gitster@pobox.com>
To: Phil Hord <hordp@cisco.com>
Cc: "git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: rerere.autoupdate that wouldn't
Date: Fri, 09 Mar 2012 14:46:30 -0800 [thread overview]
Message-ID: <7vd38l4cl5.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4F5A8580.1010807@cisco.com> (Phil Hord's message of "Fri, 09 Mar 2012 17:34:40 -0500")
Phil Hord <hordp@cisco.com> writes:
> Is this what is supposed to happen? Should I look into adding
> 'rerere.autoContinue=true'?
"Yes", and "Perhaps, but there may be a better alternative".
Whatever rerere did, "git merge", "git am", and friends should
report the fact that the result is not just a trivial conflict-free
merge, so that the user can take an appropriate action. Otherwise
you will be robbing the last chance to eyeball the result from
people who have been using rerere.autoupdate=true and doing so
before committing.
And a better alternative to make "rerere.autoupdate" stronger may be
to make the variable tri-valued, instead of adding a new variable
that does not make any sense when rerere.autoupdate is not set.
next prev parent reply other threads:[~2012-03-09 22:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 22:34 rerere.autoupdate that wouldn't Phil Hord
2012-03-09 22:46 ` Junio C Hamano [this message]
2012-03-09 22:51 ` Phil Hord
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=7vd38l4cl5.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=hordp@cisco.com \
/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.
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 NNTP newsgroup(s).