git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git rebase --continue automatic --skip?

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 10, 2011, 01:24 UTC
Message-ID
<7vy63iyk2r.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110409000351.GA7445@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 5 quoted lines
> 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.

Previous: Peter BaumannNext: Joshua Juran
Message 6 of 7 in “git rebase --continue automatic --skip?”
  1. skillzero@gmail.comApr 8, 2011
  2. Jeff KingApr 9, 2011
  3. Peter BaumannApr 9, 2011
  4. Junio C HamanoApr 10, 2011
  5. Peter BaumannApr 11, 2011
  6. Junio C HamanoApr 10, 2011
  7. Joshua JuranApr 13, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.