diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-05-22 18:29:01 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-22 18:29:01 +0900 |
| commit | 378c7c6ad48c4ccddf9b534616a0e86f28440bd3 (patch) | |
| tree | 943e2a67526de9ca0cf0996fa365178486cc0f73 /Documentation/config | |
| parent | Merge branch 'jh/simple-ipc-sans-pthread' (diff) | |
| parent | stash show: use stash.showIncludeUntracked even when diff options given (diff) | |
| download | tgif-378c7c6ad48c4ccddf9b534616a0e86f28440bd3.tar.xz | |
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
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 |