summaryrefslogtreecommitdiffstats
path: root/tree-diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-13 21:31:13 +0100
committerJunio C Hamano <gitster@pobox.com>2010-01-13 21:31:13 +0100
commit1f73566af5bec28cd8489c6139a9ede95817349c (patch)
treeb1deca9888bc171d09420d927bbe694795cf5d83 /tree-diff.c
parentMerge branch 'rs/maint-archive-match-pathspec' (diff)
parentrebase -i: teach --onto A...B syntax (diff)
downloadgit-1f73566af5bec28cd8489c6139a9ede95817349c.tar.xz
git-1f73566af5bec28cd8489c6139a9ede95817349c.zip
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 'tree-diff.c')
0 files changed, 0 insertions, 0 deletions