Andrew's git / gitweb.git / diff
?
Merge branch 'ph/rebase-original'
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 22:28:34 +0000 (15:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 22:28:34 +0000 (15:28 -0700)
* ph/rebase-original:
rebase: find orig_head unambiguously

1  2 
git-rebase.sh patch | diff1 | diff2 | blob | history
t/t3400-rebase.sh patch | diff1 | diff2 | blob | history
diff --cc git-rebase.sh
Simple merge
diff --cc t/t3400-rebase.sh
Simple merge