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

Re: Is there a way to find out which commit "git rebase --skip" skipped?

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 17, 2012, 17:48 UTC
Message-ID
<7vfw7lv28k.fsf@alter.siamese.dyndns.org>
In-Reply-To
<502E0F9C.5010303@diamand.org>
Luke Diamand <luke@diamand.org> writes:
> All I need is to be able to get the commit *immediately* after the
> failed 'git rebase'. It looks like .git/ORIG_HEAD has exactly what I
> need.

Depends on what you meant by "commit that was skipped", but the above makes me nervous. ORIG_HEAD is set to the tip of the branch being rebased at the very beginning, and updated to the current HEAD (i.e. the result of the last successful step) before --skip is given. I do not think it ever points into the commits in the original history that is being replayed.

Previous: Luke Diamand
Message 4 of 4 in “Is there a way to find out which commit "git rebase --skip" skipped?”
  1. Luke DiamandAug 16, 2012
  2. Junio C HamanoAug 16, 2012
  3. Luke DiamandAug 17, 2012
  4. Junio C HamanoAug 17, 2012

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.