Merge branch 'ph/rebase-original'
commitd1ab71804fe2afff4afa664c46a938a72fd237a7
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 22:28:34 +0000 (26 15:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 22:28:34 +0000 (26 15:28 -0700)
treeec51114efc56db221b29fc792c003fc3a8caa1db
parent019eb0dd351ee53b875df27f6748bcb69dc02063
parentea709800302ecae8c2fbb03af01e36b7f9b4d042
Merge branch 'ph/rebase-original'

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