diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2021-05-21 03:37:47 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-22 17:56:46 +0900 |
| commit | af5cd44b6f8f1934bc8b91f646eb2e73dcab57f3 (patch) | |
| tree | 9aeafe86f27bdd089aa9cb078b507755de370a0d /Documentation/config | |
| parent | stash show: fix segfault with --{include,only}-untracked (diff) | |
| download | tgif-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 'Documentation/config')
| -rw-r--r-- | Documentation/config/stash.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt index 413f907cba..9ed775281f 100644 --- a/Documentation/config/stash.txt +++ b/Documentation/config/stash.txt @@ -6,9 +6,9 @@ stash.useBuiltin:: remaining users that setting this now does nothing. stash.showIncludeUntracked:: - If this is set to true, the `git stash show` command without an - option will show the untracked files of a stash entry. Defaults to - false. See description of 'show' command in linkgit:git-stash[1]. + 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 |