diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-08-15 22:20:28 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-15 22:20:28 (GMT) |
| commit | 367ea191e659da05a2e79a7025d8628a02f8268a (patch) | |
| tree | 0273a3decb6efe958e9c665208f1f2236d0cc8c4 /Documentation/git-stash.txt | |
| parent | dda1f2a5c3aca5072aada32eef159067ba16f0e9 (diff) | |
| parent | ea41cfc4f54f884582dbda307287f12bb1fc15e9 (diff) | |
| download | git-367ea191e659da05a2e79a7025d8628a02f8268a.zip git-367ea191e659da05a2e79a7025d8628a02f8268a.tar.gz git-367ea191e659da05a2e79a7025d8628a02f8268a.tar.bz2 | |
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.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt index 4b15459..3dc16a1 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 |