diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:28:48 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-14 10:28:48 -0800 |
| commit | d3354cde33e2674493969a1870c9771ea0921084 (patch) | |
| tree | 3b4263648fbabd785a5f3c3cd0f784fc17affe78 /t/t4013/diff.diff_--stat_initial..side | |
| parent | Merge branch 'dg/subtree-fixes' (diff) | |
| parent | apply: verify submodule commit object name better (diff) | |
| download | git-d3354cde33e2674493969a1870c9771ea0921084.tar.gz git-d3354cde33e2674493969a1870c9771ea0921084.zip | |
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
Diffstat (limited to 't/t4013/diff.diff_--stat_initial..side')
0 files changed, 0 insertions, 0 deletions