Use "git merge" instead of "git pull ."

diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index a404b47b7bf80ef85e5f34595044090b7025f32c..f445cb38fa26a6daa62b5be7f65122948ca669ab 100644 (file)
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git reset' [-q] [<tree-ish>] [--] <paths>...
-'git reset' (--patch | -p) [<tree-sh>] [--] [<paths>...]
+'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]
 'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]
 
 DESCRIPTION