summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-remote-explicit-merge
diff options
context:
space:
mode:
authorLibravatar Nanako Shiraishi <nanako3@lavabit.com>2010-01-07 20:05:09 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-07 11:15:20 -0800
commit230a4566382860fc26a3f8d578a41c6504cf865f (patch)
tree00ccc093720791cc427e9a7b929f9ce5730483f9 /t/t5515/fetch.br-remote-explicit-merge
parentrebase: fix --onto A...B parsing and add tests (diff)
downloadtgif-230a4566382860fc26a3f8d578a41c6504cf865f.tar.xz
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>
Diffstat (limited to 't/t5515/fetch.br-remote-explicit-merge')
0 files changed, 0 insertions, 0 deletions