Git Mailing List Archive on lore.kernel.org
 help / color / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Neal Kreitzinger <nkreitzinger@gmail.com>
Cc: Phil Hord <phil.hord@gmail.com>,
	Neil Horman <nhorman@tuxdriver.com>,
	git@vger.kernel.org
Subject: Re: odd behavior with git-rebase
Date: Wed, 28 Mar 2012 10:08:44 -0700
Message-ID: <7viphowt43.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4F72AD25.2090102@gmail.com> (Neal Kreitzinger's message of "Wed, 28 Mar 2012 01:18:13 -0500")

Neal Kreitzinger <nkreitzinger@gmail.com> writes:

> On 3/26/2012 5:53 PM, Phil Hord wrote:
> ...
>>  2. There is a rerere autoresolved conflict git wants me to approve
>>  examine / test / --continue
>
> You trust rerere?  I take back my earlier comment,...

He does "rerere" and then "examine"s, doesn't he?  So it is not "blindly
trust", but "trust and verify".

>>  I really wanted something like this:
>>
>>  $ git rebase --purge-empty --accept-rerere-authority -i master
>>
> --accept-rerere-authority sounds like another recent thread (maybe
> from you).

It was from a different person and on a different command, but I think
they are going in the same direction.  The "--rerere-autoupdate" option of
"git am", "git rebase" and "git merge" could learn to be a bool-plus, a
stronger form than "yes/no", such that it makes a commit if everything
auto-resolves cleanly (and rerere.autoupdate configuration could learn to
be a bool-plus as well).

While I am hesitant to endorse such a mode of operation, as it can invite
sloppy users hurt themselves, I do not fundamentally oppose it as an
option.  It could save time for diligent users who know when to examine
and verify the result, in order to avoid casting the result with blind
faith in mechanical merges.

  parent reply index

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-23 18:52 Neil Horman
2012-03-23 19:54 ` Jeff King
2012-03-26 18:31   ` Phil Hord
2012-03-26 19:56     ` Jeff King
2012-03-23 20:33 ` Junio C Hamano
2012-03-24 16:55   ` Neil Horman
2012-03-26 17:12     ` Junio C Hamano
2012-03-26 17:20       ` Neil Horman
2012-03-26 21:53         ` Neal Kreitzinger
2012-03-26 22:53           ` Phil Hord
     [not found]             ` <4F72AD25.2090102@gmail.com>
2012-03-28  6:58               ` Phil Hord
2012-03-28 17:08               ` Junio C Hamano [this message]
2012-03-26 18:29       ` Phil Hord
2012-03-26 20:04         ` Neil Horman
2012-03-27  1:58         ` Jay Soffian
2012-03-26 15:27 ` Neal Kreitzinger
2012-03-26 17:18   ` Neil Horman

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=7viphowt43.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=nhorman@tuxdriver.com \
    --cc=nkreitzinger@gmail.com \
    --cc=phil.hord@gmail.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

Git Mailing List Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/git/0 git/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 git git/ https://lore.kernel.org/git \
		git@vger.kernel.org
	public-inbox-index git

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.git


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git