| commit | 9715f10e4206c681313d45efa239a594a0027e60 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Sep 2018 17:30:46 +0000 (24 10:30 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 24 Sep 2018 17:30:46 +0000 (24 10:30 -0700) | ||
| tree | df44514bcbb9194b4c5a7091357ecd97dd5b4194 | treesnapshot (tar.gz zip) |
| parent | 12d03908b760b959c250defe3c2e5621a8791eb4 | commitdiff |
| parent | 43f1180814f456ba5fb90a55c90766b5799bd1a7 | commitdiff |
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
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
| submodule.c | diff1 | diff2 | blobhistory |