mirror of
https://github.com/git/git.git
synced 2024-06-03 06:26:10 +02:00
af5cd44b6f
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>
22 lines
954 B
Plaintext
22 lines
954 B
Plaintext
stash.useBuiltin::
|
|
Unused configuration variable. Used in Git versions 2.22 to
|
|
2.26 as an escape hatch to enable the legacy shellscript
|
|
implementation of stash. Now the built-in rewrite of it in C
|
|
is always used. Setting this will emit a warning, to alert any
|
|
remaining users that setting this now does nothing.
|
|
|
|
stash.showIncludeUntracked::
|
|
If this is set to true, the `git stash show` command will show
|
|
the untracked files of a stash entry. Defaults to false. See
|
|
description of 'show' command in linkgit:git-stash[1].
|
|
|
|
stash.showPatch::
|
|
If this is set to true, the `git stash show` command without an
|
|
option will show the stash entry in patch form. Defaults to false.
|
|
See description of 'show' command in linkgit:git-stash[1].
|
|
|
|
stash.showStat::
|
|
If this is set to true, the `git stash show` command without an
|
|
option will show diffstat of the stash entry. Defaults to true.
|
|
See description of 'show' command in linkgit:git-stash[1].
|