Code

Merge branch 'jc/checkout-merge-base'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Jan 2010 20:31:13 +0000 (12:31 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Jan 2010 20:31:13 +0000 (12:31 -0800)
* 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

1  2 
builtin-checkout.c
cache.h
git-rebase--interactive.sh
git-rebase.sh
sha1_name.c

Simple merge
diff --cc cache.h
Simple merge
Simple merge
diff --cc git-rebase.sh
Simple merge
diff --cc sha1_name.c
Simple merge