From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 22 May 2021 09:29:01 +0000 (+0900)
Subject: Merge branch 'dl/stash-show-untracked-fixup'
X-Git-Tag: v2.32.0-rc1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=378c7c6ad48c4ccddf9b534616a0e86f28440bd3;p=thirdparty%2Fgit.git

Merge branch 'dl/stash-show-untracked-fixup'

Another brown paper bag inconsistency fix for a new feature
introduced during this cycle.

* dl/stash-show-untracked-fixup:
  stash show: use stash.showIncludeUntracked even when diff options given
---

378c7c6ad48c4ccddf9b534616a0e86f28440bd3