From: Andy Parkins <andyparkins@gmail.com>
To: git@vger.kernel.org, "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, Junio C Hamano <junkio@cox.net>
Subject: Re: [PATCH] Show an example of deleting commits with git-rebase.
Date: Wed, 7 Feb 2007 12:11:57 +0000 [thread overview]
Message-ID: <200702071211.58890.andyparkins@gmail.com> (raw)
In-Reply-To: <20070207101624.GC20290@mellanox.co.il>
On Wednesday 2007 February 07 10:16, Michael S. Tsirkin wrote:
> > + git-rebase --onto topicA~5 topicA~2 topicA
> Good clarification, a couple of comments:
> - The use of <branch> is more confusing than useful in this case.
> You can always just do
> git reset --hard topicA
> git-rebase --onto topicA~5 topicA~2
> instead, correct?
Seems more dangerous to me. If we're not on topicA now, then the reset would
throw away our current branch; if we are on topicA then we don't need it
(assuming the working directory is not dirty). At least with the explicit
specification of topicA as <branch> there is no risk that the user will find
themselves with their master branch junked.
> - The use of ~ notation here is also more scary than clarifying.
> git-rebase --onto F H
> will be clearer I think.
While you're right that it is clearer; it also removes the practical example.
In real life there is no easy name for F or H; they are just random hashes.
topicA~5 will work in real life as well as the example.
Andy
--
Dr Andy Parkins, M Eng (hons), MIEE
andyparkins@gmail.com
prev parent reply other threads:[~2007-02-07 12:12 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-05 20:21 [PATCH] Show an example of deleting commits with git-rebase Shawn O. Pearce
2007-02-07 10:16 ` Michael S. Tsirkin
2007-02-07 10:25 ` Jakub Narebski
2007-02-07 12:11 ` Andy Parkins [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=200702071211.58890.andyparkins@gmail.com \
--to=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=mst@mellanox.co.il \
--cc=spearce@spearce.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.