Merge branch 'db/vcs-svn-incremental' into svn-fe

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 4aa6404f4e7897c200983aa8f4fcdb7befbc5cec..30a67486d2dc9eb4169a9ba5ebd5db513a3a84f8 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -217,6 +217,13 @@ config key: svn.commiturl (overwrites all svn-remote.<name>.commiturl options)
 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.