diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-09-08 00:55:23 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-09-08 00:55:23 +0000 |
| commit | c28068f42827f92c7c73c184e4fd11ceba0c73da (patch) | |
| tree | 2ea9bf073e1f773ca1fcfb8bf76ec28ead3687e4 /git-stash.txt | |
| parent | 35b47ca5285a4059792ba937f8e09b2ab4a7adf4 (diff) | |
| download | git-htmldocs-c28068f42827f92c7c73c184e4fd11ceba0c73da.tar.gz | |
Autogenerated HTML docs for v1.6.5-rc0
Diffstat (limited to 'git-stash.txt')
| -rw-r--r-- | git-stash.txt | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/git-stash.txt b/git-stash.txt index 2f5ca7b1a..3f14b727b 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -13,7 +13,7 @@ SYNOPSIS 'git stash' drop [-q|--quiet] [<stash>] 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' branch <branchname> [<stash>] -'git stash' [save [--keep-index] [-q|--quiet] [<message>]] +'git stash' [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] 'git stash' clear 'git stash' create @@ -42,15 +42,27 @@ is also possible). OPTIONS ------- -save [--keep-index] [-q|--quiet] [<message>]:: +save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>]:: Save your local modifications to a new 'stash', and run `git reset - --hard` to revert them. This is the default action when no - subcommand is given. The <message> part is optional and gives - the description along with the stashed state. + --hard` to revert them. The <message> part is optional and gives + the description along with the stashed state. For quickly making + a snapshot, you can omit _both_ "save" and <message>, but giving + only <message> does not trigger this action to prevent a misspelled + subcommand from making an unwanted stash. + If the `--keep-index` option is used, all changes already added to the index are left intact. ++ +With `--patch`, you can interactively select hunks from in the diff +between HEAD and the working tree to be stashed. The stash entry is +constructed such that its index state is the same as the index state +of your repository, and its worktree contains only the changes you +selected interactively. The selected changes are then rolled back +from your worktree. ++ +The `--patch` option implies `--keep-index`. You can use +`--no-keep-index` to override this. list [<options>]:: |