From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: replacing a bad commit
Date: Mon, 05 Feb 2007 21:38:47 +0100 [thread overview]
Message-ID: <eq84ht$oaf$1@sea.gmane.org> (raw)
In-Reply-To: 20070205195332.GW14499@daga.cl
Blu Corater wrote:
> On Mon, Feb 05, 2007 at 05:38:18PM +0100, Jakub Narebski wrote:
>> Try using
>>
>> $ git rebase --onto A' A local
>
> Thanks a lot, that did it.
>
> I've got confused by the wording of the git-rebase man page. It says:
>
> <upstream>
> Upstream branch to compare against
>
> Which suggests to me that <upstream> must be a branch tip, and not a
> random commit, as seems to be the case (well, not random, but reachable
> from <branch> if I understand well). Also, the man page doesn't give any
> example of rebasing using a random commit as <upstream>, they all use
> branch tips which reinforced my wrong assumption.
Well, I think that two examples of using --onto should make it clear
enough (especially second one), and both are quite similar to your
situation I think.
But I agree that git-rebase(1) needs clarification. Do you volunteer? ;-)
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2007-02-05 20:37 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-05 15:39 replacing a bad commit Blu Corater
2007-02-05 16:38 ` Jakub Narebski
2007-02-05 19:53 ` Blu Corater
2007-02-05 20:02 ` Shawn O. Pearce
2007-02-05 20:21 ` Blu Corater
2007-02-05 20:38 ` Jakub Narebski [this message]
2007-02-05 20:53 ` Blu Corater
2007-02-05 20:58 ` Shawn O. Pearce
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='eq84ht$oaf$1@sea.gmane.org' \
--to=jnareb@gmail.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).