summaryrefslogtreecommitdiffstats
path: root/git-stash.html
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.html
parent6efe282375a8e498caee44e50d8fe31f38f1e402 (diff)
downloadgit-htmldocs-921b9fd7b402da06e7370c11491a9fc30b0013ff.tar.gz
Autogenerated HTML docs for v2.32.0-rc1
Diffstat (limited to 'git-stash.html')
-rw-r--r--git-stash.html8
1 files changed, 5 insertions, 3 deletions
diff --git a/git-stash.html b/git-stash.html
index d95469df2..1d9cade35 100644
--- a/git-stash.html
+++ b/git-stash.html
@@ -848,8 +848,10 @@ show [-u|--include-untracked|--only-untracked] [&lt;diff-options&gt;] [&lt;stash
By default, the command shows the diffstat, but it will accept any
format known to <em>git diff</em> (e.g., <code>git stash show -p stash@{1}</code>
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 <code>&lt;diff-option&gt;</code> is provided, the default behavior will be given
+ by the <code>stash.showStat</code>, and <code>stash.showPatch</code> config variables. You
+ can also use <code>stash.showIncludeUntracked</code> to set whether
+ <code>--include-untracked</code> is enabled by default.
</p>
</dd>
<dt class="hdlist1">
@@ -1245,7 +1247,7 @@ xargs git log --merges --no-walk --grep=WIP</code></pre>
<div id="footer">
<div id="footer-text">
Last updated
- 2021-03-23 06:17:33 JST
+ 2021-05-22 21:08:23 JST
</div>
</div>
</body>