diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:33 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-19 16:45:33 +0900 |
| commit | cfd635c7428dfca5b45d8d45fdc1311e751d4fe2 (patch) | |
| tree | 3bd1754e72887659e52ee03342a4a9098fe9c247 /git-merge-one-file.sh | |
| parent | Merge branch 'cm/notes-comment-fix' (diff) | |
| parent | fsmonitor: force a refresh after the index was discarded (diff) | |
| download | tgif-cfd635c7428dfca5b45d8d45fdc1311e751d4fe2.tar.xz | |
Merge branch 'js/fsmonitor-refresh-after-discarding-index'
The fsmonitor interface got out of sync after the in-core index
file gets discarded, which has been corrected.
* js/fsmonitor-refresh-after-discarding-index:
fsmonitor: force a refresh after the index was discarded
fsmonitor: demonstrate that it is not refreshed after discard_index()
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions