diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:03:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 14:03:41 -0700 |
| commit | a5aca6e883639ce3a3ad07271032905edc0ac608 (patch) | |
| tree | d668c311a147fc10e2c83b96c01506938fc02930 /upload-pack.c | |
| parent | Merge branch 'nd/reset-setup-worktree' into maint (diff) | |
| parent | diff: do not reuse_worktree_file for submodules (diff) | |
| download | tgif-a5aca6e883639ce3a3ad07271032905edc0ac608.tar.xz | |
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
Diffstat (limited to 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions