diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:25:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-14 14:25:20 -0700 |
| commit | 481e6aaaccbef810f6c43cfd46058cff36cb1c66 (patch) | |
| tree | 8b7d1324dcdc0944b46ac8f3c35c166e6a2796b0 /Makefile | |
| parent | 6eb593a764303c05c7ca4f0fd107c5118b9cf7fb (diff) | |
| parent | aba4727281612c3e24914691727e11e1f44a9aac (diff) | |
| download | git-481e6aaaccbef810f6c43cfd46058cff36cb1c66.tar.gz | |
Merge branch 'tr/diff-submodule-no-reuse-worktree'
"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
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions