From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Mar 2015 23:02:27 +0000 (-0800)
Subject: Merge branch 'mg/doc-remote-tags-or-not'
X-Git-Tag: v2.4.0-rc0~59
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/79de649c0f452c0366a7306819f10760f4ed8b92?hp=a3eea73cc8370a3feeb9ca48ef88594d79c1ce9d

Merge branch 'mg/doc-remote-tags-or-not'

"git remote add" mentioned "--tags" and "--no-tags" and was not
clear that fetch from the remote in the future will use the default
behaviour when neither is given to override it.

* mg/doc-remote-tags-or-not:
git-remote.txt: describe behavior without --tags and --no-tags
---

diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index a77607b852..4c6d6de7b7 100644
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@ -58,6 +58,9 @@ remote repository.
 With `--no-tags` option, `git fetch <name>` does not import tags from
 the remote repository.
 +
+By default, only tags on fetched branches are imported
+(see linkgit:git-fetch[1]).
++
 With `-t <branch>` option, instead of the default glob
 refspec for the remote to track all branches under
 the `refs/remotes/<name>/` namespace, a refspec to track only `<branch>`