summaryrefslogtreecommitdiff
path: root/diff-lib.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-13 12:31:13 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-13 12:31:13 -0800
commit1f73566af5bec28cd8489c6139a9ede95817349c (patch)
treeb1deca9888bc171d09420d927bbe694795cf5d83 /diff-lib.c
parent5b9c0a699bdf9727d25eceb7b980dbede96bfd8e (diff)
parent230a4566382860fc26a3f8d578a41c6504cf865f (diff)
downloadgit-1f73566af5bec28cd8489c6139a9ede95817349c.tar.gz
Merge branch 'jc/checkout-merge-base'
* jc/checkout-merge-base: rebase -i: teach --onto A...B syntax rebase: fix --onto A...B parsing and add tests "rebase --onto A...B" replays history on the merge base between A and B "checkout A...B" switches to the merge base between A and B
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions