From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Mar 2014 21:26:22 +0000 (-0700)
Subject: Merge branch 'jm/stash-doc-k-for-keep'
X-Git-Tag: v2.0.0-rc0~119
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/430e4761ce2f95151ccf46f0ec3d5081e9475730?hp=d52571d5c10efeb35ceeeb17f9b5e5f0ca1c3019

Merge branch 'jm/stash-doc-k-for-keep'

* jm/stash-doc-k-for-keep:
stash doc: mention short form -k in save description
---

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