diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 14:27:10 -0700 |
| commit | 10432cc810eb9228dde99b38e2b4b37f5c80d12e (patch) | |
| tree | 0a910eec49b51268b53890a259265ba833999b18 /git-rebase--preserve-merges.sh | |
| parent | Merge branch 'vv/merge-squash-with-explicit-commit' into maint (diff) | |
| parent | mark_fsmonitor_valid(): mark the index as changed if needed (diff) | |
| download | tgif-10432cc810eb9228dde99b38e2b4b37f5c80d12e.tar.xz | |
Merge branch 'js/fsmonitor-unflake' into maint
The data collected by fsmonitor was not properly written back to
the on-disk index file, breaking t7519 tests occasionally, which
has been corrected.
* js/fsmonitor-unflake:
mark_fsmonitor_valid(): mark the index as changed if needed
fill_stat_cache_info(): prepare for an fsmonitor fix
Diffstat (limited to 'git-rebase--preserve-merges.sh')
0 files changed, 0 insertions, 0 deletions