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

Re: git rebase --skip

From
Jeff King <peff@peff.net>
Date
Nov 8, 2007, 03:23 UTC
Message-ID
<20071108032308.GA5638@sigill.intra.peff.net>
In-Reply-To
<20071107222105.GA31666@glandium.org>
On Wed, Nov 07, 2007 at 11:21:05PM +0100, Mike Hommey wrote:
> I use git-rebase quite regularly, and I haven't used git-rebase --skip
> after a failed merge without first resetting the working tree. I was
> wondering if it wouldn't make sense to automatically do the reset when
> running git-rebase --skip.

I have often been annoyed by this behavior, too, and I can't think of any situation where you _wouldn't_ want the reset to happen. But I would be more comfortable hearing confirmation from others that they can't think of such a situation.

-Peff
Previous: Johannes SchindelinNext: Jakub Narebski
Message 3 of 20 in “git rebase --skip”
  1. Mike HommeyNov 7, 2007
  2. Johannes SchindelinNov 7, 2007
  3. Jeff KingNov 8, 2007
  4. Jakub NarebskiNov 8, 2007
  5. Björn SteinbrinkNov 8, 2007
  6. Andreas EricssonNov 8, 2007
  7. Björn SteinbrinkNov 8, 2007
  8. Jeff KingNov 8, 2007
  9. Junio C HamanoNov 8, 2007
  10. Björn SteinbrinkNov 9, 2007
  11. Jeff KingNov 9, 2007
  12. Johannes SchindelinNov 9, 2007
  13. J. Bruce FieldsNov 9, 2007
  14. J. Bruce FieldsNov 9, 2007
  15. Jeff KingNov 9, 2007
  16. Daniel BarkalowNov 8, 2007
  17. Mike HommeyNov 8, 2007
  18. Mike HommeyNov 8, 2007
  19. Johannes SchindelinNov 8, 2007
  20. Do git reset --hard HEAD when using git rebase --skipMike Hommey, Nov 8, 2007

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.