All of lore.kernel.org
 help / color / mirror / Atom feed
From: Phil Hord <hordp@cisco.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: rerere.autoupdate that wouldn't
Date: Fri, 09 Mar 2012 17:51:54 -0500	[thread overview]
Message-ID: <4F5A898A.2060701@cisco.com> (raw)
In-Reply-To: <7vd38l4cl5.fsf@alter.siamese.dyndns.org>

Writ Junio C Hamano <gitster@pobox.com>,
> 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.

Any preference on the third option-name?

I think  'False || True || Continue'

Phil

      reply	other threads:[~2012-03-09 22:52 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
2012-03-09 22:51   ` Phil Hord [this message]

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=4F5A898A.2060701@cisco.com \
    --to=hordp@cisco.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.