| commit | a5aca6e883639ce3a3ad07271032905edc0ac608 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Mar 2014 21:03:41 +0000 (18 14:03 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 18 Mar 2014 21:03:41 +0000 (18 14:03 -0700) | ||
| tree | d668c311a147fc10e2c83b96c01506938fc02930 | treesnapshot (tar.gz zip) |
| parent | 1f569775810be1655c284076082015168865d005 | commitdiff |
| parent | aba4727281612c3e24914691727e11e1f44a9aac | commitdiff |
Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint
"git diff --external-diff" incorrectly fed the submodule directory
in the working tree to the external diff driver when it knew it is
the same as one of the versions being compared.
* tr/diff-submodule-no-reuse-worktree:
diff: do not reuse_worktree_file for submodules
"git diff --external-diff" incorrectly fed the submodule directory
in the working tree to the external diff driver when it knew it is
the same as one of the versions being compared.
* tr/diff-submodule-no-reuse-worktree:
diff: do not reuse_worktree_file for submodules
| diff.c | diff1 | diff2 | blobhistory |
| t/t4020-diff-external.sh | diff1 | diff2 | blobhistory |