diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:43 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:43 +0900 |
| commit | 07c5a1bce304a7f6ff11edae9c819798a85caeec (patch) | |
| tree | 1af769731b6ab3f6c675126b61aa55281772b65b /builtin/merge-tree.c | |
| parent | Merge branch 'js/rebase-i-autosquash-fix' into maint (diff) | |
| parent | git-mv: allow submodules and fsmonitor to work together (diff) | |
| download | tgif-07c5a1bce304a7f6ff11edae9c819798a85caeec.tar.xz | |
Merge branch 'bp/mv-submodules-with-fsmonitor' into maint
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 'builtin/merge-tree.c')
0 files changed, 0 insertions, 0 deletions