Re: [PATCH] Show an example of deleting commits with git-rebase.
- From
- Andy Parkins <andyparkins@gmail.com>
- Date
- Feb 7, 2007, 12:11 UTC
- Message-ID
- <200702071211.58890.andyparkins@gmail.com>
- 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
Show 6 quoted lines
> 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