diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:52:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-11 13:52:33 -0700 |
| commit | 5865559b9be66a59108c9f38b1e9f4d91201ebc6 (patch) | |
| tree | bdad72f4662a17c90cd364827bd442cdebe47a7c /git-stash.txt | |
| parent | 68e177455eeeda998a408ddbb0dc05cb8282b287 (diff) | |
| download | git-htmldocs-5865559b9be66a59108c9f38b1e9f4d91201ebc6.tar.gz | |
Autogenerated HTML docs for v1.8.3.2-768-g91101
Diffstat (limited to 'git-stash.txt')
| -rw-r--r-- | git-stash.txt | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/git-stash.txt b/git-stash.txt index db7e80303..7c8b648fb 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -14,7 +14,8 @@ SYNOPSIS 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' branch <branchname> [<stash>] 'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] - [-u|--include-untracked] [-a|--all] [<message>]] + [-u|--include-untracked] [-a|--all] [-f|--force] + [<message>]] 'git stash' clear 'git stash' create [<message>] 'git stash' store [-m|--message <message>] [-q|--quiet] <commit> @@ -44,7 +45,7 @@ is also possible). OPTIONS ------- -save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]:: +save [-p|--patch] [--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-f|--force] [<message>]:: Save your local modifications to a new 'stash', and run `git reset --hard` to revert them. The <message> part is optional and gives @@ -71,6 +72,13 @@ linkgit:git-add[1] to learn how to operate the `--patch` mode. + The `--patch` option implies `--keep-index`. You can use `--no-keep-index` to override this. ++ +In some cases, saving a stash could mean irretrievably removing some +data - if a directory with untracked files replaces a tracked file of +the same name, the new untracked files are not saved (except in case +of `--include-untracked`) but the original tracked file shall be restored. +By default, `stash save` will abort in such a case; `--force` will allow +it to remove the untracked files. list [<options>]:: |