author | Junio C Hamano <junkio@cox.net> | |
Tue, 14 Feb 2006 22:42:05 +0000 (14:42 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 15 Feb 2006 00:10:49 +0000 (16:10 -0800) | ||
commit | e646c9c8c0aa995eac284ea0a2117add19c4461c | |
tree | 83e836fa63354e778fbcf3806b0a95c2dff708bd | tree | snapshot |
parent | 6a9b87972f27edfe53da4ce016adf4c0cd42f5e6 | commit | diff |
rebase: allow rebasing onto different base.
This allows you to rewrite history a bit more flexibly, by
separating the other branch name and new branch point. By
default, the new branch point is the same as the tip of the
other branch as before, but you can specify where you graft the
rebased branch onto.
When you have this ancestry graph:
A---B---C topic
/
D---E---F---G master
$ git rebase --onto master~1 master topic
would rewrite the history to look like this:
A'\''--B'\''--C'\'' topic
/
D---E---F---G master
Signed-off-by: Junio C Hamano <junkio@cox.net>
This allows you to rewrite history a bit more flexibly, by
separating the other branch name and new branch point. By
default, the new branch point is the same as the tip of the
other branch as before, but you can specify where you graft the
rebased branch onto.
When you have this ancestry graph:
A---B---C topic
/
D---E---F---G master
$ git rebase --onto master~1 master topic
would rewrite the history to look like this:
A'\''--B'\''--C'\'' topic
/
D---E---F---G master
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rebase.sh | diff | blob | history |