summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-03-14 14:26:22 -0700
committerJunio C Hamano <gitster@pobox.com>2014-03-14 14:26:23 -0700
commit430e4761ce2f95151ccf46f0ec3d5081e9475730 (patch)
tree3b8ca4896d8cbb2dd7b22b442cee2d3fff3de251
parentd52571d5c10efeb35ceeeb17f9b5e5f0ca1c3019 (diff)
parentc20aec05e35f4f0e62e892b335aebebd6196ca92 (diff)
downloadgit-430e4761ce2f95151ccf46f0ec3d5081e9475730.tar.gz
Merge branch 'jm/stash-doc-k-for-keep'
* jm/stash-doc-k-for-keep: stash doc: mention short form -k in save description
-rw-r--r--Documentation/git-stash.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index db7e803038..375213fe46 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -44,7 +44,7 @@ is also possible).
OPTIONS
-------
-save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
+save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
Save your local modifications to a new 'stash', and run `git reset
--hard` to revert them. The <message> part is optional and gives