summaryrefslogtreecommitdiff
path: root/Documentation/git-stash.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-08-15 15:20:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-08-15 15:20:28 -0700
commit367ea191e659da05a2e79a7025d8628a02f8268a (patch)
tree0273a3decb6efe958e9c665208f1f2236d0cc8c4 /Documentation/git-stash.txt
parentImplement 'git stash save --patch' (diff)
parentMake 'git stash -k' a short form for 'git stash save --keep-index' (diff)
downloadtgif-367ea191e659da05a2e79a7025d8628a02f8268a.tar.xz
Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
* commit 'tr/reset-checkout-patch^^2': Make 'git stash -k' a short form for 'git stash save --keep-index'
Diffstat (limited to 'Documentation/git-stash.txt')
-rw-r--r--Documentation/git-stash.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 4b15459c83..3dc16a108a 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -13,7 +13,8 @@ SYNOPSIS
'git stash' drop [-q|--quiet] [<stash>]
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
'git stash' branch <branchname> [<stash>]
-'git stash' [save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>]]
+'git stash' [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]]
+'git stash' [-k|--keep-index]
'git stash' clear
'git stash' create