From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Tue, 19 Apr 2011 12:24:27 +0000 (+0200)
Subject: git-svn.txt: Document --mergeinfo
X-Git-Tag: v1.7.4.5~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ccc2fcf54cd6cfa9f15c110d064e10aa8d71ddb1;p=git.git

git-svn.txt: Document --mergeinfo

6abd933 (git-svn: allow the mergeinfo property to be set, 2010-09-24)
introduced the --mergeinfo option. Document it.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index e161a40a7..4f262a935 100644
--- 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.