From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Mar 2020 17:58:16 +0000 (-0700)
Subject: Merge branch 'jc/doc-single-h-is-for-help'
X-Git-Tag: v2.26.0-rc2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cdef998b4619cb9acfe2955fcbe9db0ea2f46d33;p=thirdparty%2Fgit.git

Merge branch 'jc/doc-single-h-is-for-help'

Both "git ls-remote -h" and "git grep -h" give short usage help,
like any other Git subcommand, but it is not unreasonable to expect
that the former would behave the same as "git ls-remote --head"
(there is no other sensible behaviour for the latter).  The
documentation has been updated in an attempt to clarify this.

* jc/doc-single-h-is-for-help:
  Documentation: clarify that `-h` alone stands for `help`
---

cdef998b4619cb9acfe2955fcbe9db0ea2f46d33
diff --cc Documentation/git-ls-remote.txt
index a2ea1fd687,c9e68582a4..0a5c8b7d49
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@@ -28,10 -28,12 +28,12 @@@ OPTION
  	Limit to only refs/heads and refs/tags, respectively.
  	These options are _not_ mutually exclusive; when given
  	both, references stored in refs/heads and refs/tags are
- 	displayed.
+ 	displayed.  Note that `git ls-remote -h` used without
+ 	anything else on the command line gives help, consistent
+ 	with other git subcommands.
  
  --refs::
 -	Do not show peeled tags or pseudorefs like HEAD	in the output.
 +	Do not show peeled tags or pseudorefs like `HEAD` in the output.
  
  -q::
  --quiet::