Merge branch 'dl/stash-show-untracked'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Mar 2021 21:00:24 +0000 (14:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Mar 2021 21:00:24 +0000 (14:00 -0700)
commitf5c73f69fd711f4814a2e8da78a0a2f4dbb46013
tree8189b949645acae74d33f5b3210928b0bb8d58f0
parentdd4048d1c76f067ad7b339dfb3a5f4765f5ae979
parent0af760e26191acd3c5957841461ff224b80b43f7
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
builtin/stash.c
contrib/completion/git-completion.bash
t/t3905-stash-include-untracked.sh
unpack-trees.c