From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2016 20:14:52 +0000 (-0700)
Subject: Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc'
X-Git-Tag: v2.11.0-rc0~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/24cfb6ff58d849201de35c87663b83affd1b7f72?ds=inline;hp=-c

Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc'

Shorten description of auto-following in "git tag" by removing a
mention of historical remotes layout which is not relevant to the
main topic.

* yk/git-tag-remove-mention-of-old-layout-in-doc:
doc: remove reference to the traditional layout in git-tag.txt
---

24cfb6ff58d849201de35c87663b83affd1b7f72
diff --combined Documentation/git-tag.txt
index 7ecca8e247,ccd98d9df4..80019c584b
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@@ -78,7 -78,7 +78,7 @@@ OPTION
  
  -v::
  --verify::
 -	Verify the gpg signature of the given tag names.
 +	Verify the GPG signature of the given tag names.
  
  -n<num>::
  	<num> specifies how many lines from the annotation, if any,
@@@ -104,7 -104,7 +104,7 @@@
  	order can also be affected by the
  	"versionsort.prereleaseSuffix" configuration variable.
  	The keys supported are the same as those in `git for-each-ref`.
 -	Sort order defaults to the value configured for the 'tag.sort'
 +	Sort order defaults to the value configured for the `tag.sort`
  	variable if it exists, or lexicographic order otherwise. See
  	linkgit:git-config[1].
  
@@@ -167,7 -167,7 +167,7 @@@ This option is only applicable when lis
  
  --[no-]merged [<commit>]::
  	Only list tags whose tips are reachable, or not reachable
 -	if '--no-merged' is used, from the specified commit ('HEAD'
 +	if `--no-merged` is used, from the specified commit (`HEAD`
  	if not specified).
  
  CONFIGURATION
@@@ -253,9 -253,8 +253,8 @@@ On Automatic followin
  ~~~~~~~~~~~~~~~~~~~~~~
  
  If you are following somebody else's tree, you are most likely
- using remote-tracking branches (`refs/heads/origin` in traditional
- layout, or `refs/remotes/origin/master` in the separate-remote
- layout).  You usually want the tags from the other end.
+ using remote-tracking branches (eg. `refs/remotes/origin/master`).
+ You usually want the tags from the other end.
  
  On the other hand, if you are fetching because you would want a
  one-shot merge from somebody else, you typically do not want to