aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-09-24 10:30:46 -0700
committerJunio C Hamano <gitster@pobox.com>2018-09-24 10:30:46 -0700
commit9715f10e4206c681313d45efa239a594a0027e60 (patch)
treedf44514bcbb9194b4c5a7091357ecd97dd5b4194 /diff.c
parentMerge branch 'ds/format-patch-range-diff-test' (diff)
parentgit-mv: allow submodules and fsmonitor to work together (diff)
downloadgit-9715f10e4206c681313d45efa239a594a0027e60.tar.gz
git-9715f10e4206c681313d45efa239a594a0027e60.zip
Merge branch 'bp/mv-submodules-with-fsmonitor'
When fsmonitor is in use, after operation on submodules updates .gitmodules, we lost track of the fact that we did so and relied on stale fsmonitor data. * bp/mv-submodules-with-fsmonitor: git-mv: allow submodules and fsmonitor to work together
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions