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 5, 2011, 21:43 UTC
Message-ID
<1309902196.31762.30.camel@drew-northup.unet.maine.edu>
In-Reply-To
<1309574324-6833-1-git-send-email-martin.von.zweigbergk@gmail.com>
On Fri, 2011-07-01 at 22:38 -0400, Martin von Zweigbergk wrote:
Show 6 quoted lines
> The description for 'git rebase --abort' currently says:
> 
>     Restore the original branch and abort the rebase operation.
> 
> The "restore" can be misinterpreted to imply that the original branch
> was somehow in a broken state during the rebase operation.

When you are in the middle of a rebase you _are_not_on_any_branch_. This is why "Restore the original branch" is used. I have to admit that it could potentially be clearer, but your solution alas is not.

Show 8 quoted lines
> It is also
> not completely clear what "the original branch" is --- is it the
> branch that was checked out before the rebase operation was called or
> is the the branch that is being rebased (it is the latter)? Although
> both issues are made clear in the DESCRIPTION section, let us also
> make the entry in the OPTIONS secion more clear, like so:
> 
>     Abort the rebase operation and check out <branch>.

So when I rebase I'm really checking out another branch--which, just to increase confusion, doesn't actually exist? What if there isn't another branch (rebase -i on a single-branch repo, for instance)? This doesn't solve the problem.

Show 12 quoted lines
> 
> Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
> ---
> 
> This was basically suggested by Jonathan in [1] ('git rebase
> --discard'/'git rebase --abort --stay' or whatever it should be
> called). Since I have not had much time for Git lately, I thought I
> would just post these two patches for now, in case it will take time
> before I get a chance to move even the simple work in [1] forward.
> 
> 
>  [1] http://thread.gmane.org/gmane.comp.version-control.git/174655/focus=174683
-- 
-Drew Northup
________________________________________________
"As opposed to vegetable or mineral error?"
-John Pescatore, SANS NewsBites Vol. 12 Num. 59
Previous: Martin von ZweigbergkNext: Martin von Zweigbergk
Message 2 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.