From: Christian Couder Date: Tue, 08 Dec 2009 07:56:14 GMT Subject: [PATCH v4 5/6] Documentation: reset: describe new "--keep-local-changes" option Message-ID: <20091208075616.4475.46978.chriscool@tuxfamily.org> In-Reply-To: <20091208075005.4475.26582.chriscool@tuxfamily.org> Signed-off-by: Christian Couder --- 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..a6c080e 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] [] +'git reset' [--mixed | --soft | --hard | --merge | --keep-local-changes] [-q] [] 'git reset' [-q] [] [--] ... 'git reset' --patch [] [--] [...] @@ -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-local-changes:: + 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.5.1.gaf97d