Merge branch 'dm/tree-walk'

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index e75fc191d35fa98eac96dbc2e0cbf3d6069e5737..f977e8780b5e152b18d07a61fde8c2f86f98a0ce 100644 (file)
--- 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.
@@ -310,7 +318,7 @@ Any other arguments are passed directly to 'git log'
        Show what revision and author last modified each line of a file. The
        output of this mode is format-compatible with the output of
        `svn blame' by default. Like the SVN blame command,
-       local uncommitted changes in the working copy are ignored;
+       local uncommitted changes in the working tree are ignored;
        the version of the file in the HEAD revision is annotated. Unknown
        arguments are passed directly to 'git blame'.
 +