| commit | 1f73566af5bec28cd8489c6139a9ede95817349c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jan 2010 20:31:13 +0000 (13 12:31 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Jan 2010 20:31:13 +0000 (13 12:31 -0800) | ||
| tree | b1deca9888bc171d09420d927bbe694795cf5d83 | treesnapshot (tar.gz zip) |
| parent | 5b9c0a699bdf9727d25eceb7b980dbede96bfd8e | commitdiff |
| parent | 230a4566382860fc26a3f8d578a41c6504cf865f | commitdiff |
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
* 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
| builtin-checkout.c | diff1 | diff2 | blobhistory |
| cache.h | diff1 | diff2 | blobhistory |
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |
| git-rebase.sh | diff1 | diff2 | blobhistory |
| sha1_name.c | diff1 | diff2 | blobhistory |