]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'bp/mv-submodules-with-fsmonitor' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:43 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:43 +0000 (22:57 +0900)
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

1  2 
submodule.c

diff --cc submodule.c
Simple merge