user-manual: mention 'git remote add' for remote branch config

I hardly ever setup remote.<name>.url using 'git config'.  While it
may be instructive to do so, we should also point out 'git remote
add'.

Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index a546b10ee1c6a12bc9e856f137f65db6e4bf1ba0..c28ba0dac0284173e29ae79ebc7b3fa6af1736eb 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -2856,48 +2856,34 @@ branch.master.merge=refs/heads/master
 
 If there are other repositories that you also use frequently, you can
 create similar configuration options to save typing; for example,
 
 If there are other repositories that you also use frequently, you can
 create similar configuration options to save typing; for example,

-after

 
 -------------------------------------------------
 
 -------------------------------------------------

-$ git config remote.example.url git://example.com/proj.git
+$ git remote add example git://example.com/proj.git

 -------------------------------------------------
 
 -------------------------------------------------
 

-then the following two commands will do the same thing:
+adds the following to `.git/config`:

 
 -------------------------------------------------
 
 -------------------------------------------------

-$ git fetch git://example.com/proj.git master:refs/remotes/example/master
-$ git fetch example master:refs/remotes/example/master
+[remote "example"]
+       url = git://example.com/proj.git
+       fetch = +refs/heads/*:refs/remotes/example/*

 -------------------------------------------------
 
 -------------------------------------------------
 

-Even better, if you add one more option:
-
--------------------------------------------------
-$ git config remote.example.fetch master:refs/remotes/example/master
--------------------------------------------------
+Also note that the above configuration can be performed by directly
+editing the file `.git/config` instead of using linkgit:git-remote[1].

 
 

-then the following commands will all do the same thing:
+After configuring the remote, the following three commands will do the
+same thing:

 
 -------------------------------------------------
 
 -------------------------------------------------

-$ git fetch git://example.com/proj.git master:refs/remotes/example/master
-$ git fetch example master:refs/remotes/example/master
+$ git fetch git://example.com/proj.git +refs/heads/*:refs/remotes/example/*
+$ git fetch example +refs/heads/*:refs/remotes/example/*

 $ git fetch example
 -------------------------------------------------
 
 $ git fetch example
 -------------------------------------------------
 

-You can also add a "+" to force the update each time:
-
--------------------------------------------------
-$ git config remote.example.fetch +master:refs/remotes/example/master
--------------------------------------------------
-
-Don't do this unless you're sure you won't mind "git fetch" possibly
-throwing away commits on 'example/master'.
-
-Also note that all of the above configuration can be performed by
-directly editing the file .git/config instead of using
-linkgit:git-config[1].
-

 See linkgit:git-config[1] for more details on the configuration
 See linkgit:git-config[1] for more details on the configuration

-options mentioned above.
+options mentioned above and linkgit:git-fetch[1] for more details on
+the refspec syntax.

 
 
 [[git-concepts]]
 
 
 [[git-concepts]]