[PATCH v5 6/7] Documentation: reset: describe new "--keep" option
flat view
STALE3772d
From: Christian Couder <hidden>
Date: 2016-06-15 22:47:54
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Christian Couder <redacted> --- Documentation/git-reset.txt | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 2d27e40..f8724d0 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt@@ -8,7 +8,7 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git reset' [--mixed | --soft | --hard | --merge] [-q] [<commit>] +'git reset' [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>] 'git reset' [-q] [<commit>] [--] <paths>... 'git reset' --patch [<commit>] [--] [<paths>...]
@@ -52,6 +52,11 @@ OPTIONS and updates the files that are different between the named commit and the current commit in the working tree. +--keep:: + This does the same thing as --merge, but it keeps changes in + the working tree and the index or it aborts if it is not + possible. + -p:: --patch:: Interactively select hunks in the difference between the index
--
1.6.6.rc1.8.gd33ec