Merge branch 'tg/stash-refresh-index'
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:32:53 +0000 (11:32 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:32:53 +0000 (11:32 +0900)
"git stash" learned to write refreshed index back to disk.

* tg/stash-refresh-index:
  stash: make sure to write refreshed cache
  merge: use refresh_and_write_cache
  factor out refresh_and_write_cache function

1  2 
builtin/am.c
builtin/merge.c
cache.h
read-cache.c
t/t3903-stash.sh

diff --cc builtin/am.c
Simple merge
diff --cc builtin/merge.c
Simple merge
diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge
Simple merge