summaryrefslogtreecommitdiff
path: root/t/t3910-mac-os-precompose.sh
diff options
context:
space:
mode:
authorLibravatar Denton Liu <liu.denton@gmail.com>2021-05-21 03:37:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-22 17:56:46 +0900
commitaf5cd44b6f8f1934bc8b91f646eb2e73dcab57f3 (patch)
tree9aeafe86f27bdd089aa9cb078b507755de370a0d /t/t3910-mac-os-precompose.sh
parentstash show: fix segfault with --{include,only}-untracked (diff)
downloadtgif-af5cd44b6f8f1934bc8b91f646eb2e73dcab57f3.tar.xz
stash show: use stash.showIncludeUntracked even when diff options given
If options pertaining to how the diff is displayed is provided to `git stash show`, the command will ignore the stash.showIncludeUntracked configuration variable, defaulting to not showing any untracked files. This is unintuitive behaviour since the format of the diff output and whether or not to display untracked files are orthogonal. Use stash.showIncludeUntracked even when diff options are given. Of course, this is still overridable via the command-line options. Update the documentation to explicitly say which configuration variables will be overridden when a diff options are given. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3910-mac-os-precompose.sh')
0 files changed, 0 insertions, 0 deletions