From: Junio C Hamano Date: Thu, 14 Feb 2013 18:28:48 +0000 (-0800) Subject: Merge branch 'jc/extended-fake-ancestor-for-gitlink' X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d3354cde33e2674493969a1870c9771ea0921084;p=git.git Merge branch 'jc/extended-fake-ancestor-for-gitlink' Instead of requiring the full 40-hex object names on the index line, we can read submodule commit object names from the textual diff when synthesizing a fake ancestore tree for "git am -3". * jc/extended-fake-ancestor-for-gitlink: apply: verify submodule commit object name better --- d3354cde33e2674493969a1870c9771ea0921084