From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Mar 2021 21:00:24 +0000 (-0700)
Subject: Merge branch 'dl/stash-show-untracked'
X-Git-Tag: v2.32.0-rc0~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5c73f69fd711f4814a2e8da78a0a2f4dbb46013;p=thirdparty%2Fgit.git

Merge branch 'dl/stash-show-untracked'

"git stash show" learned to optionally show untracked part of the
stash.

* dl/stash-show-untracked:
  stash show: learn stash.showIncludeUntracked
  stash show: teach --include-untracked and --only-untracked
---

f5c73f69fd711f4814a2e8da78a0a2f4dbb46013