projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6aae0e2 af5cd44)
Merge branch 'dl/stash-show-untracked-fixup'
authorJunio C Hamano <gitster@pobox.com>
Sat, 22 May 2021 09:29:01 +0000 (18:29 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 22 May 2021 09:29:01 +0000 (18:29 +0900)
commit378c7c6ad48c4ccddf9b534616a0e86f28440bd3
tree943e2a67526de9ca0cf0996fa365178486cc0f73tree | snapshot
parent6aae0e2ad2fdb5cc87358d7c4337e145c0b99fe9commit | diff
parentaf5cd44b6f8f1934bc8b91f646eb2e73dcab57f3commit | diff
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
builtin/stash.c diff1 | diff2 | blob | history
t/t3905-stash-include-untracked.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.