summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-03-14 14:25:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-14 14:25:20 -0700
commit481e6aaaccbef810f6c43cfd46058cff36cb1c66 (patch)
tree8b7d1324dcdc0944b46ac8f3c35c166e6a2796b0 /t/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial
parentMerge branch 'nd/reset-setup-worktree' (diff)
parentdiff: do not reuse_worktree_file for submodules (diff)
downloadtgif-481e6aaaccbef810f6c43cfd46058cff36cb1c66.tar.xz
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 't/t4013/diff.diff-tree_--pretty_--root_--patch-with-stat_initial')
0 files changed, 0 insertions, 0 deletions