aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-11-29 15:41:44 -0800
committerJunio C Hamano <gitster@pobox.com>2021-11-29 15:41:44 -0800
commitdea96aae4d4821a7d516257daa6be4be893887cd (patch)
tree647e84acc652d1d9fd2c2f7801613a48a3d551df /Documentation
parent96eca029bf96dd739c0868ed8cf56cdcf1a248f4 (diff)
parent2e59e78096313920df470b6645a4323e2d8c0c6f (diff)
downloadgit-dea96aae4d4821a7d516257daa6be4be893887cd.tar.xz
Merge branch 'ow/stash-count-in-status-porcelain-output'
Allow "git status --porcelain=v2" to show the number of stash entries with --show-stash like the normal output does. * ow/stash-count-in-status-porcelain-output: status: print stash info with --porcelain=v2 --show-stash status: count stash entries in separate function
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-status.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 4a2c3e0408..54a4b29b47 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -314,6 +314,14 @@ Line Notes
------------------------------------------------------------
....
+Stash Information
+^^^^^^^^^^^^^^^^^
+
+If `--show-stash` is given, one line is printed showing the number of stash
+entries if non-zero:
+
+ # stash <N>
+
Changed Tracked Entries
^^^^^^^^^^^^^^^^^^^^^^^