undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-stash.txt: better docs for '--patch'

Browse Source 
Describe '-p' as a short form of '--patch' in synopsis and options.  Also
refer the reader to the patch mode description of git-add documentation.

Helped-by: Jeff King <peff@peff.net>
Mentored-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Valentin Haenel 2011-05-05 20:48:47 +02:00 committed by Junio C Hamano
parent c105356ed4
commit f2808a50a6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-stash.txt
View File

@ -13,7 +13,7 @@ SYNOPSIS
'git stash' drop [-q|--quiet] [<stash>] 'git stash' drop [-q|--quiet] [<stash>]
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
'git stash' branch <branchname> [<stash>] 'git stash' branch <branchname> [<stash>]
'git stash' [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]] 'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]]
'git stash' clear 'git stash' clear
'git stash' create 'git stash' create
@ -42,7 +42,7 @@ is also possible).
OPTIONS OPTIONS
------- -------
save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>]:: save [-p|--patch] [--[no-]keep-index] [-q|--quiet] [<message>]::
Save your local modifications to a new 'stash', and run `git reset Save your local modifications to a new 'stash', and run `git reset
--hard` to revert them. The <message> part is optional and gives --hard` to revert them. The <message> part is optional and gives
@ -54,12 +54,13 @@ save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>]::
If the `--keep-index` option is used, all changes already added to the If the `--keep-index` option is used, all changes already added to the
index are left intact. index are left intact.
+ +
With `--patch`, you can interactively select hunks from in the diff With `--patch`, you can interactively select hunks from the diff
between HEAD and the working tree to be stashed. The stash entry is 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 constructed such that its index state is the same as the index state
of your repository, and its worktree contains only the changes you of your repository, and its worktree contains only the changes you
selected interactively. The selected changes are then rolled back selected interactively. The selected changes are then rolled back
from your worktree. from your worktree. See the ``Interactive Mode'' section of
linkgit:git-add[1] to learn how to operate the `\--patch` mode.
+ +
The `--patch` option implies `--keep-index`. You can use The `--patch` option implies `--keep-index`. You can use
`--no-keep-index` to override this. `--no-keep-index` to override this.