diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:10 -0700 |
| commit | 03969dff8f6ab2e399df7e156c72d5b965388d2f (patch) | |
| tree | 56e9ed5fd6ccd33c6679568c2735b57d54dec26d /Documentation/git-tag.txt | |
| parent | Merge tag 'l10n-2.10.0-rnd2.4' of git://github.com/git-l10n/git-po into maint (diff) | |
| parent | doc: remove reference to the traditional layout in git-tag.txt (diff) | |
| download | tgif-03969dff8f6ab2e399df7e156c72d5b965388d2f.tar.xz | |
Merge branch 'yk/git-tag-remove-mention-of-old-layout-in-doc' into maint
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
Diffstat (limited to 'Documentation/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 |