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

Re: [PATCH 2/2] git-rebase.txt: clarify that --abort checks out <branch>

From
Drew Northup <drew.northup@maine.edu>
Date
Jul 6, 2011, 13:25 UTC
Message-ID
<1309958707.10212.6.camel@drew-northup.unet.maine.edu>
In-Reply-To
<20110706025228.GB10015@elie>
On Tue, 2011-07-05 at 21:52 -0500, Jonathan Nieder wrote:
Show 13 quoted lines
> Martin von Zweigbergk wrote:
> 
> > That reminds me that <branch> may not have been specified. How about
> > saying things more explicitly like this?
> >
> >   Abort the rebase operation and reset HEAD to the original branch. If
> >   <branch> was provided when the rebase operation was started, then
> >   HEAD will be reset to <branch>. Otherwise HEAD will be reset to
> >   where it was when the rebase operation was started.
> 
> Sounds great to me for what it's worth.  (With the caveat that "git
> rebase --abort" reattaches HEAD in addition to what "git reset --hard"
> would do, but I think it's fine to just leave that implied.)
Agreed, that is better.
-- 
-Drew Northup
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
Previous: Jonathan NiederNext: Martin von Zweigbergk
Message 5 of 10 in “git-rebase.txt: clarify that --abort checks out <branch>”
  1. 2/2 git-rebase.txt: clarify that --abort checks out <branch>Martin von Zweigbergk, Jul 2, 2011
  2. Drew NorthupJul 5, 2011
  3. Martin von ZweigbergkJul 6, 2011
  4. Jonathan NiederJul 6, 2011
  5. Drew NorthupJul 6, 2011
  6. git-rebase.txt: clarify that --abort checks out <branch>Martin von Zweigbergk, Jul 8, 2011
  7. Junio C HamanoJul 8, 2011
  8. Martin von ZweigbergkJul 10, 2011
  9. git-rebase.txt: clarify that --abort checks out <branch>Martin von Zweigbergk, Jul 10, 2011
  10. rebase: clarify "restore the original branch"Martin von Zweigbergk, Jul 14, 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.