summaryrefslogtreecommitdiff
path: root/compat/vcbuild
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-11-20 03:02:44 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-21 09:22:55 -0800
commit61dfa1bb6710690e53fa20bc3ddd1f5fbe8c1d22 (patch)
tree628df3a2adaf54ca3e6a00e852c659a62f3b2fb5 /compat/vcbuild
parent"checkout A...B" switches to the merge base between A and B (diff)
downloadtgif-61dfa1bb6710690e53fa20bc3ddd1f5fbe8c1d22.tar.xz
"rebase --onto A...B" replays history on the merge base between A and B
This is in spirit similar to "checkout A...B". To re-queue a new set of patches for a series that the original author prepared to apply on 'next' on the same base as before, you would do something like this: $ git checkout next^0 $ git am -s rerolled-series.mbox $ git rebase --onto next...jh/notes next The first two commands recreates commits to be rebased as the original author intended (i.e. applies directly on top of 'next'), and the rebase command replays that history on top of the same commit the series being replaced was built on (which is typically much older than the tip of 'next'). Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/vcbuild')
0 files changed, 0 insertions, 0 deletions