git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* Typo in git-reset man page.
@ 2013-07-19 16:22 Ibrahim M. Ghazal
  2013-07-19 16:26 ` [PATCH] Documentation, git reset: fix typo Stefan Beller
  0 siblings, 1 reply; 3+ messages in thread
From: Ibrahim M. Ghazal @ 2013-07-19 16:22 UTC (permalink / raw)
  To: git

On this line: https://git.kernel.org/cgit/git/git.git/tree/Documentation/git-reset.txt#n12

"tree-sh" should be "tree-ish".

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH] Documentation, git reset: fix typo.
  2013-07-19 16:22 Typo in git-reset man page Ibrahim M. Ghazal
@ 2013-07-19 16:26 ` Stefan Beller
  2013-07-19 17:16   ` Jonathan Nieder
  0 siblings, 1 reply; 3+ messages in thread
From: Stefan Beller @ 2013-07-19 16:26 UTC (permalink / raw)
  To: git, imgx64; +Cc: Stefan Beller

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] Documentation, git reset: fix typo.
  2013-07-19 16:26 ` [PATCH] Documentation, git reset: fix typo Stefan Beller
@ 2013-07-19 17:16   ` Jonathan Nieder
  0 siblings, 0 replies; 3+ messages in thread
From: Jonathan Nieder @ 2013-07-19 17:16 UTC (permalink / raw)
  To: Stefan Beller; +Cc: git, imgx64

Stefan Beller wrote:

> --- 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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-07-19 17:17 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-19 16:22 Typo in git-reset man page Ibrahim M. Ghazal
2013-07-19 16:26 ` [PATCH] Documentation, git reset: fix typo Stefan Beller
2013-07-19 17:16   ` Jonathan Nieder

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).