Merge branch 'maint'

* maint:
GIT 1.5.0.2
git-remote: support remotes with a dot in the name
Documentation: describe "-f/-t/-m" options to "git-remote add"
diff --cc: fix display of symlink conflicts during a merge.

diff --combined Documentation/git-remote.txt
index 250761f97ed9b43cf6cec9fb36e835ed80327cd5,a2ff8f098ebff138751a3559fee54019584e096a..266faade31ae646a419616fc0fce9d676f112d9d
--- 1/Documentation/git-remote.txt
--- 2/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@@ -13,7 -13,6 +13,7 @@@ SYNOPSI
  'git-remote' add <name> <url>
  'git-remote' show <name>
  'git-remote' prune <name>
 +'git-remote' update [group]
  
  DESCRIPTION
  -----------
@@@ -32,6 -31,19 +32,19 @@@ subcommands are available to perform op
  Adds a remote named <name> for the repository at
  <url>.  The command `git fetch <name>` can then be used to create and
  update remote-tracking branches <name>/<branch>.
+ +
+ With `-f` option, `git fetch <name>` is run immediately after
+ the remote information is set up.
+ +
+ With `-t <branch>` option, instead of the default glob
+ refspec for the remote to track all branches under
+ `$GIT_DIR/remotes/<name>/`, a refspec to track only `<branch>`
+ is created.  You can give more than one `-t <branch>` to track
+ multiple branche without grabbing all branches.
+ +
+ With `-m <master>` option, `$GIT_DIR/remotes/<name>/HEAD` is set
+ up to point at remote's `<master>` branch instead of whatever
+ branch the `HEAD` at the remote repository actually points at.
  
  'show'::
  
@@@ -41,17 -53,7 +54,17 @@@ Gives some information about the remot
  
  Deletes all stale tracking branches under <name>.
  These stale branches have already been removed from the remote repository
 -referenced by <name>, but are still locally available in "remotes/<name>".
 +referenced by <name>, but are still locally available in
 +"remotes/<name>".
 +
 +'update'::
 +
 +Fetch updates for a named set of remotes in the repository as defined by
 +remotes.<group>.  If a named group is not specified on the command line,
 +the configuration parameter remotes.default will get used; if
 +remotes.default is not defined, all remotes which do not the
 +configuration parameter remote.<name>.skipDefaultUpdate set to true will
 +be updated.  (See gitlink:git-config[1]).
  
  
  DISCUSSION