diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-22 14:00:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-22 14:00:24 -0700 |
| commit | f5c73f69fd711f4814a2e8da78a0a2f4dbb46013 (patch) | |
| tree | 8189b949645acae74d33f5b3210928b0bb8d58f0 /Documentation/config | |
| parent | Merge branch 'en/ort-perf-batch-8' (diff) | |
| parent | stash show: learn stash.showIncludeUntracked (diff) | |
| download | tgif-f5c73f69fd711f4814a2e8da78a0a2f4dbb46013.tar.xz | |
Merge branch 'dl/stash-show-untracked'
"git stash show" learned to optionally show untracked part of the
stash.
* dl/stash-show-untracked:
stash show: learn stash.showIncludeUntracked
stash show: teach --include-untracked and --only-untracked
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/stash.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt index 00eb35434e..413f907cba 100644 --- a/Documentation/config/stash.txt +++ b/Documentation/config/stash.txt @@ -5,6 +5,11 @@ stash.useBuiltin:: 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 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]. + 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. |