From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2013 23:14:22 +0000 (-0800)
Subject: Merge branch 'jc/fake-ancestor-with-non-blobs' into maint
X-Git-Tag: v1.8.1.3~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/427c6d0caf0caee5ad2c4925910a6b8ebcf95408?ds=inline;hp=--cc

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

Rebasing the history of superproject with change in the submodule
has been 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
---

427c6d0caf0caee5ad2c4925910a6b8ebcf95408