author | Nanako Shiraishi <nanako3@lavabit.com> | |
Thu, 7 Jan 2010 11:05:09 +0000 (20:05 +0900) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 7 Jan 2010 19:15:20 +0000 (11:15 -0800) | ||
commit | 230a4566382860fc26a3f8d578a41c6504cf865f | |
tree | 00ccc093720791cc427e9a7b929f9ce5730483f9 | tree | snapshot |
parent | 9f21e97ddccf114a6919cf4b8cf57c2838328f36 | commit | diff |
rebase -i: teach --onto A...B syntax
When rewriting commits on a topic branch, sometimes it is easier to
compare the version of commits before and after the rewrite if they are
based on the same commit that forked from the upstream. An earlier commit
by Junio (fixed up by the previous commit) gives "--onto A...B" syntax to
rebase command, and rebases on top of the merge base between A and B;
teach the same to the interactive version, too.
Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When rewriting commits on a topic branch, sometimes it is easier to
compare the version of commits before and after the rewrite if they are
based on the same commit that forked from the upstream. An earlier commit
by Junio (fixed up by the previous commit) gives "--onto A...B" syntax to
rebase command, and rebases on top of the merge base between A and B;
teach the same to the interactive version, too.
Signed-off-by: しらいし ななこ <nanako3@lavabit.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase--interactive.sh | diff | blob | history | |
t/t3415-rebase-onto-threedots.sh | diff | blob | history |