From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Oct 2019 02:32:53 +0000 (+0900)
Subject: Merge branch 'tg/stash-refresh-index'
X-Git-Tag: v2.24.0-rc0~86
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba2d45112224a0bd5ba0f10ba180c88d148cec36;p=thirdparty%2Fgit.git

Merge branch 'tg/stash-refresh-index'

"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
---

ba2d45112224a0bd5ba0f10ba180c88d148cec36