tree 943e2a67526de9ca0cf0996fa365178486cc0f73
parent 6aae0e2ad2fdb5cc87358d7c4337e145c0b99fe9
parent af5cd44b6f8f1934bc8b91f646eb2e73dcab57f3
author Junio C Hamano <gitster@pobox.com> 1621675741 +0900
committer Junio C Hamano <gitster@pobox.com> 1621675741 +0900

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