Sync with 1.7.4.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --combined Documentation/git-svn.txt
index 4aa6404f4e7897c200983aa8f4fcdb7befbc5cec,4f262a935d91b8ce9a9ec6ca65fd05d46667cf64..30a67486d2dc9eb4169a9ba5ebd5db513a3a84f8
--- 1/Documentation/git-svn.txt
--- 2/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@@ -217,6 -217,13 +217,13 @@@ config key: svn.commiturl (overwrites a
  Using this option for any other purpose (don't ask) is very strongly
  discouraged.
  
+ --mergeinfo=<mergeinfo>;;
+       Add the given merge information during the dcommit
+       (e.g. `--mergeinfo="/branches/foo:1-10"`). All svn server versions can
+       store this information (as a property), and svn clients starting from
+       version 1.5 can make use of it. 'git svn' currently does not use it
+       and does not set it automatically.
+ 
  'branch'::
        Create a branch in the SVN repository.
  
@@@ -648,16 -655,6 +655,16 @@@ svn-remote.<name>.rewriteUUID:
        where the original UUID is not available via either useSvmProps
        or useSvnsyncProps.
  
 +svn-remote.<name>.pushurl::
 +
 +      Similar to git's 'remote.<name>.pushurl', this key is designed
 +      to be used in cases where 'url' points to an SVN repository
 +      via a read-only transport, to provide an alternate read/write
 +      transport. It is assumed that both keys point to the same
 +      repository. Unlike 'commiturl', 'pushurl' is a base path. If
 +      either 'commiturl' or 'pushurl' could be used, 'commiturl'
 +      takes precedence.
 +
  svn.brokenSymlinkWorkaround::
        This disables potentially expensive checks to workaround
        broken symlinks checked into SVN by broken clients.  Set this
@@@ -888,6 -885,10 +895,6 @@@ SEE ALS
  --------
  linkgit:git-rebase[1]
  
 -Author
 -------
 -Written by Eric Wong <normalperson@yhbt.net>.
 -
 -Documentation
 --------------
 -Written by Eric Wong <normalperson@yhbt.net>.
 +GIT
 +---
 +Part of the linkgit:git[1] suite