From: Johannes Sixt <j.sixt@viscovery.net>
To: "Carlos Martín Nieto" <cmn@elego.de>
Cc: Orgad and Raizel Shaneh <orgads@gmail.com>, git@vger.kernel.org
Subject: Re: git rebase -i does not rebase if all lines are removed
Date: Tue, 17 Jul 2012 14:25:15 +0200 [thread overview]
Message-ID: <500559AB.9000304@viscovery.net> (raw)
In-Reply-To: <1342522535.20671.7.camel@centaur.cmartin.tk>
Am 7/17/2012 12:55, schrieb Carlos Martín Nieto:
> But more important would be /why/ you feel that rebase -i is the tool
> you should be using. If you'd like to move the branch pointer back,
> that's what the reset command is for.
Perhaps because that's not what the OP wanted to do?
Sometimes it happens that you rebase a bunch of commits, and only a
handful remains because the others are already in upstream. Looking at
each remaining one closely, you decide that they don't have to be rebased
(maybe because slightly modified versions are in upstream), so you remove
them one by one, and you end up with an empty list.
This has happened to me at one point, and writing "noop" after the list is
empty is a minor nuisance. But I am not complaining. Because being able to
abort an interactive rebase by clearing the list is much more important.
-- Hannes
prev parent reply other threads:[~2012-07-17 12:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-17 10:46 git rebase -i does not rebase if all lines are removed Orgad and Raizel Shaneh
2012-07-17 10:55 ` Carlos Martín Nieto
2012-07-17 12:25 ` Johannes Sixt [this message]
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=500559AB.9000304@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=cmn@elego.de \
--cc=git@vger.kernel.org \
--cc=orgads@gmail.com \
/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).