Merge branch 'il/remote-updates'

* il/remote-updates:
  Add git remote set-url

diff --combined Documentation/git-remote.txt
index b03ccaac3d651df396bb6fe310bad0aac17b2054,35d32f7de41d788e6cd0a3c1c50d20a1425eabdf..3fc599c0c7d5495ada81b20e4d37fa4936708270
--- 1/Documentation/git-remote.txt
--- 2/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@@ -14,6 -14,9 +14,9 @@@ SYNOPSI
  'git remote rename' <old> <new>
  'git remote rm' <name>
  'git remote set-head' <name> (-a | -d | <branch>)
+ 'git remote set-url' [--push] <name> <newurl> [<oldurl>]
+ 'git remote set-url --add' [--push] <name> <newurl>
+ 'git remote set-url --delete' [--push] <name> <url>
  'git remote' [-v | --verbose] 'show' [-n] <name>
  'git remote prune' [-n | --dry-run] <name>
  'git remote' [-v | --verbose] 'update' [-p | --prune] [group | remote]...
@@@ -101,6 -104,20 +104,20 @@@ remote set-head origin master" will se
  `refs/remotes/origin/master` already exists; if not it must be fetched first.
  +
  
+ 'set-url'::
+ 
+ Changes URL remote points to. Sets first URL remote points to matching
+ regex <oldurl> (first URL if no <oldurl> is given) to <newurl>. If
+ <oldurl> doesn't match any URL, 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 '--delete', instead of changing some URL, all URLs matching
+ regex <url> are deleted. Trying to delete all non-push URLs is an
+ error.
+ 
  'show'::
  
  Gives some information about the remote <name>.
@@@ -161,7 -178,7 +178,7 @@@ $ git checkout -b nfs linux-nfs/maste
  ...
  ------------
  
 -* Imitate 'git-clone' but track only selected branches
 +* Imitate 'git clone' but track only selected branches
  +
  ------------
  $ mkdir project.git