summaryrefslogtreecommitdiffstats
path: root/git-stash.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-05-22 21:10:51 +0900
committerJunio C Hamano <gitster@pobox.com>2021-05-22 21:10:51 +0900
commit921b9fd7b402da06e7370c11491a9fc30b0013ff (patch)
treede44bc62ed602790ec10d71e122e064dbe12ef90 /git-stash.txt
parent6efe282375a8e498caee44e50d8fe31f38f1e402 (diff)
downloadgit-htmldocs-921b9fd7b402da06e7370c11491a9fc30b0013ff.tar.gz
Autogenerated HTML docs for v2.32.0-rc1
Diffstat (limited to 'git-stash.txt')
-rw-r--r--git-stash.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/git-stash.txt b/git-stash.txt
index a8c8c32f1..be6084cce 100644
--- a/git-stash.txt
+++ b/git-stash.txt
@@ -91,8 +91,10 @@ show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]::
By default, the command shows the diffstat, but it will accept any
format known to 'git diff' (e.g., `git stash show -p stash@{1}`
to view the second most recent entry in patch form).
- You can use stash.showIncludeUntracked, stash.showStat, and
- stash.showPatch config variables to change the default behavior.
+ If no `<diff-option>` is provided, the default behavior will be given
+ by the `stash.showStat`, and `stash.showPatch` config variables. You
+ can also use `stash.showIncludeUntracked` to set whether
+ `--include-untracked` is enabled by default.
pop [--index] [-q|--quiet] [<stash>]::