| commit | d3354cde33e2674493969a1870c9771ea0921084 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Feb 2013 18:28:48 +0000 (14 10:28 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Feb 2013 18:28:48 +0000 (14 10:28 -0800) | ||
| tree | 3b4263648fbabd785a5f3c3cd0f784fc17affe78 | treesnapshot (tar.gz zip) |
| parent | 260adc87b3d6c00650ba2dd493abd9a6603ca4f1 | commitdiff |
| parent | 5e026920a9465c6c3e026c5bf0d1c4d9d3f05cfa | commitdiff |
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
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
| builtin/apply.c | diff1 | diff2 | blobhistory |