git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Joshua Jensen <jjensen@workspacewhiz.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: git rebase --abort of an --onto run does not checkout the originating branch
Date: Fri, 22 Oct 2010 11:01:02 -0600	[thread overview]
Message-ID: <4CC1C34E.8090203@workspacewhiz.com> (raw)

'git rebase --abort' has documentation stating it will restore the 
original <branch>.  This works great for my basic usage of 'git rebase 
--interactive', for instance.

When running 'git rebase --onto', it does exactly what the documentation 
states, but the restored branch is not desirable.

To cherry pick a range of commits, I run:

git rebase --onto mybranch START_SHA END_SHA

In the middle, I decide to run 'git rebase --abort'.

Just as the documentation states, it performs a checkout of END_SHA as 
the restored branch.  END_SHA has nothing to do with the originating 
branch, and confusion ensues.

Is there a reason why 'git rebase' should not store off the originating 
branch and use that for an --abort, instead of <branch> which is END_SHA?

Thanks.

Josh

             reply	other threads:[~2010-10-22 17:01 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-10-22 17:01 Joshua Jensen [this message]
2010-10-22 19:15 ` git rebase --abort of an --onto run does not checkout the originating branch Junio C Hamano
2010-10-28  3:04   ` Joshua Jensen
2010-10-28 16:22     ` Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4CC1C34E.8090203@workspacewhiz.com \
    --to=jjensen@workspacewhiz.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).