X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-svn.txt;h=08cad6d2b676642b37b5a871cd52617c4308a748;hb=6e89b37d34f9a58182192664f304c15f525be4d2;hp=e75fc191d35fa98eac96dbc2e0cbf3d6069e5737;hpb=4b1108eec79ffb35d651a2dd8277973ed3b5cc6b;p=git.git

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index e75fc191d..08cad6d2b 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -225,6 +225,14 @@ discouraged.
 	version 1.5 can make use of it. To specify merge information from multiple
 	branches, use a single space character between the branches
 	(`--mergeinfo="/branches/foo:1-10 /branches/bar:3,5-6,8"`)
++
+[verse]
+config key: svn.pushmergeinfo
++
+This option will cause git-svn to attempt to automatically populate the
+svn:mergeinfo property in the SVN repository when possible. Currently, this can
+only be done when dcommitting non-fast-forward merges where all parents but the
+first have already been pushed into SVN.
 
 'branch'::
 	Create a branch in the SVN repository.