diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:52 -0700 |
| commit | 24cfb6ff58d849201de35c87663b83affd1b7f72 (patch) | |
| tree | 334efac9155a3a21be9a4d67f5cee08d16fa3e19 | |
| parent | 46d58a084b86a7fc5149939d3ade77a0abedc0d2 (diff) | |
| parent | 749a2279a4e29b91a6e91a25340ad30373189313 (diff) | |
| download | git-24cfb6ff58d849201de35c87663b83affd1b7f72.tar.gz | |
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
| -rw-r--r-- | Documentation/git-tag.txt | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 7ecca8e247..80019c584b 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 |