Re: What's in git.git
- From
- linux@horizon.com <linux@horizon.com>
- Date
- Feb 17, 2006, 14:28 UTC
- Message-ID
- <20060217142836.13137.qmail@science.horizon.com>
- "Rebase to different branch" (1 commit):
This was previously discussed on the list. With this command line:
$ git rebase --onto master~1 master topic
would rebase this ancestry graph to:
A---B---C topic
/
D---E---F---G master
another graph that looks like this:
A'--B'--C' topic
/
D---E---F---G masterEarlier, you couldn't rebase to anywhere other than on top of "the other branch".
Er... what does this do, again? I couldn't find the list discussion, and I can get this exact effect in vanilla 1.2.1 with "git rebase master~1 topic". AFAIK, $ARGV[1] of git-rebase only has to be a commit-ish, not a branch.
OTOH, I can imagine wanting $ git-rebase master~1 topic topic~2
to produce
A B---C topic
/ /
D---E---F---G masterH'm... I wonder if the same syntax could be used to resolve the ambiguous case where there are multiple possible common ancestors, e.g.
A---B---C topic
/ /
D---E---F---G masteras discussed in the "git rebase behaviour changed?" thread...