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?ds=inline;hp=-c

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
---

79de649c0f452c0366a7306819f10760f4ed8b92
diff --combined Documentation/git-remote.txt
index a77607b852,f52d20a943..4c6d6de7b7
--- a/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@@ -58,6 -58,9 +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>`
@@@ -130,25 -133,17 +133,25 @@@ branches, adds to that list
  
  'set-url'::
  
 -Changes URL remote points to. Sets first URL remote points to matching
 +Changes URLs for the remote. Sets first URL for remote <name> that matches
  regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If
 -<oldurl> doesn't match any URL, error occurs and nothing is changed.
 +<oldurl> doesn't match any URL, an error occurs and nothing is changed.
  +
  With '--push', push URLs are manipulated instead of fetch URLs.
  +
 -With '--add', instead of changing some URL, new URL is added.
 +With '--add', instead of changing existing URLs, new URL is added.
  +
 -With '--delete', instead of changing some URL, all URLs matching
 -regex <url> are deleted. Trying to delete all non-push URLs is an
 -error.
 +With '--delete', instead of changing existing URLs, all URLs matching
 +regex <url> are deleted for remote <name>.  Trying to delete all
 +non-push URLs is an error.
 ++
 +Note that the push URL and the fetch URL, even though they can
 +be set differently, must still refer to the same place.  What you
 +pushed to the push URL should be what you would see if you
 +immediately fetched from the fetch URL.  If you are trying to
 +fetch from one place (e.g. your upstream) and push to another (e.g.
 +your publishing repository), use two separate remotes.
 +
  
  'show'::