diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:29 -0800 |
| commit | e361f36f61b664a36db1d34c3f9e3427ac42656d (patch) | |
| tree | 3a34e8dbb31faa251fd7865a8b0aebef76dd3ff7 /builtin/fmt-merge-msg.c | |
| parent | Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint (diff) | |
| parent | restore: invalidate cache-tree when removing entries with --staged (diff) | |
| download | tgif-e361f36f61b664a36db1d34c3f9e3427ac42656d.tar.xz | |
Merge branch 'nd/switch-and-restore' into maint
"git restore --staged" did not correctly update the cache-tree
structure, resulting in bogus trees to be written afterwards, which
has been corrected.
* nd/switch-and-restore:
restore: invalidate cache-tree when removing entries with --staged
Diffstat (limited to 'builtin/fmt-merge-msg.c')
0 files changed, 0 insertions, 0 deletions