git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: skillzero@gmail.com,
	Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: git rebase --continue automatic --skip?
Date: Sat, 09 Apr 2011 18:24:44 -0700	[thread overview]
Message-ID: <7vy63iyk2r.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20110409000351.GA7445@sigill.intra.peff.net> (Jeff King's message of "Fri, 8 Apr 2011 20:03:51 -0400")

Jeff King <peff@peff.net> writes:

> I put it in rebase and not straight into "git am", as I'm not sure that
> "am" would want to share the same behavior. I'm not sure why we haven't
> done this up until now. Maybe there is some corner case I'm not thinking
> of where the user would want to do something besides skip when we hit
> this situation. I dunno.

I think the "rebase --continue" behaviour was more or less deliberate (I
do not necessarily agree with the reasoning, though).  It is to ensure
that the user has a chance to examine the situation and acknowledge that
it is fine to completely drop the now obsoleted change, as having to
adjust the change to an updated base, even with conflict resolution, may
be common, it is a rare and notable event that the resolution ends up
being empty.

  parent reply	other threads:[~2011-04-10  1:25 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-08 20:30 git rebase --continue automatic --skip? skillzero
2011-04-09  0:03 ` Jeff King
2011-04-09 13:03   ` Peter Baumann
2011-04-10  1:33     ` Junio C Hamano
2011-04-11  6:10     ` Peter Baumann
2011-04-10  1:24   ` Junio C Hamano [this message]
2011-04-13 19:02     ` Joshua Juran

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=7vy63iyk2r.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=martin.von.zweigbergk@gmail.com \
    --cc=peff@peff.net \
    --cc=skillzero@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
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).