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

Re: rebase: Ask before doing anything not undoable

From
Ricardo Biehl Pasquali <pasqualirb@gmail.com>
Date
Dec 21, 2018, 00:23 UTC
Message-ID
<20181221002336.GA10482@localhost.localdomain>
In-Reply-To
<53e97c08-1eaf-5f83-a699-5666376bb4c4@virtuell-zuhause.de>
On Thu, Dec 20, 2018 at 10:37:00PM +0100, Thomas Braun wrote:
Show 9 quoted lines
> The git rebase documentation has
>
> ORIG_HEAD is set to point at the tip of the branch before the reset.
>
> so doing
>
> git reset ORIG_HEAD
>
> does reset to the state before the rebase.
That's pretty easy :-)
> For avoiding the original problem of --co completing to
> --committer-date-is-author-date I'm using the alias rc for git rebase
> --continue.

It's definetly an alternative. Anyway, ORIG_HEAD reset is sufficient for the cases when enter is hit before noticing the completion string.

Thank you!
	pasquali
Previous: Thomas Braun
Message 6 of 6 in “rebase: Ask before doing anything not undoable”
  1. Ricardo Biehl PasqualiDec 20, 2018
  2. Thomas BraunDec 20, 2018
  3. Ricardo Biehl PasqualiDec 20, 2018
  4. Ricardo Biehl PasqualiDec 20, 2018
  5. Thomas BraunDec 20, 2018
  6. Ricardo Biehl PasqualiDec 21, 2018

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.