From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Feb 2013 00:13:11 +0000 (-0800)
Subject: Merge branch 'jc/fake-ancestor-with-non-blobs'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6d81ce0543c2fb7177c08491ba31a69aa54b7930;p=git.git

Merge branch 'jc/fake-ancestor-with-non-blobs'

Rebasing the history of superproject with change in the submodule
was broken since v1.7.12.

* jc/fake-ancestor-with-non-blobs:
  apply: diagnose incomplete submodule object name better
  apply: simplify build_fake_ancestor()
  git-am: record full index line in the patch used while rebasing
---

6d81ce0543c2fb7177c08491ba31a69aa54b7930