On this line: https://git.kernel.org/cgit/git/git.git/tree/Documentation/git-reset.txt#n12
"tree-sh" should be "tree-ish".
Stefan Beller[PATCH] Documentation, git reset: fix typo.
Reported-By: Ibrahim M. Ghazal <imgx64@gmail.com> Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> --- Documentation/git-reset.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index a404b47..f445cb3 100644 --- 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
-- 1.8.3.3.754.g9c3c367.dirty
Jonathan NiederRe: [PATCH] Documentation, git reset: fix typo.
Stefan Beller wrote:
Show 9 quoted lines
> --- 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>]
Sure. Though these days it might make more sense to say
'git reset' [--soft | --mixed | --hard | --merge | --keep] <commit> [--] 'git reset' [<tree>] [--] <path>... 'git reset' (--patch | -p) [<tree>] [--] [<path>...]
since commands accept a commit or tag where a tree is expected pretty much universally.
Hope that helps, Jonathan