From: Younes Khoudli Date: Thu, 20 Oct 2016 13:21:44 +0000 (+0200) Subject: doc: remove reference to the traditional layout in git-tag.txt X-Git-Tag: v2.10.2~25^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=749a2279a4e29b91a6e91a25340ad30373189313;p=git doc: remove reference to the traditional layout in git-tag.txt This is the only place in the documentation that the traditional layout is mentioned, and it is confusing. Remove it. * Documentation/git-tag.txt: Here. Signed-off-by: Younes Khoudli Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index abab4814ec..ccd98d9df4 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -253,9 +253,8 @@ On Automatic following ~~~~~~~~~~~~~~~~~~~~~~ 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