X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-reset.txt;h=927ecee2f26cdf0bd30457d5016b654c01a23a14;hb=0235017eafa8dfc3a7353b7091ad5109d0beb7a5;hp=fd72976371cee0fcd25e3419138eb13382dc6ab8;hpb=fa1c8542cb3ed2a193aac2e514ebe12d7fe22a04;p=git.git

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index fd7297637..927ecee2f 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -76,15 +76,10 @@ In other words, --merge does something like a 'git read-tree -u -m <commit>',
 but carries forward unmerged index entries.
 
 --keep::
-	Resets the index, updates files in the working tree that are
-	different between <commit> and HEAD, but keeps those
-	which are different between HEAD and the working tree (i.e.
-	which have local changes).
+	Resets index entries and updates files in the working tree that are
+	different between <commit> and HEAD.
 	If a file that is different between <commit> and HEAD has local changes,
 	reset is aborted.
-+
-In other words, --keep does a 2-way merge between <commit> and HEAD followed by
-'git reset --mixed <commit>'.
 --
 
 If you want to undo a commit other than the latest on a branch,