Merge branch 'ph/rebase-original' into next
commitc643dcdf712daae7041fbb25c870c35ec5aae544
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2013 00:32:09 +0000 (24 17:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Apr 2013 00:32:09 +0000 (24 17:32 -0700)
tree28f0cdb3086bdef90cbcf0d5f4ebc715e0393568
parent70efbe7162a14aa5e2311c3556da26932b6fc0bb
parentea709800302ecae8c2fbb03af01e36b7f9b4d042
Merge branch 'ph/rebase-original' into next

* ph/rebase-original:
  rebase: find orig_head unambiguously
git-rebase.sh
t/t3400-rebase.sh