summaryrefslogtreecommitdiffstats
path: root/git-svn.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2011-04-19 22:42:05 +0000
committerJunio C Hamano <junio@kernel.org>2011-04-19 22:42:05 +0000
commit0a90152c2cf35e4ffbc6ff2353496173582ab80d (patch)
treeaeb755fe0dfc6ff1d2eaa7f39f933257f2b6b688 /git-svn.txt
parentf75a94048af9e423a3d8cba694531d0d08bd82b4 (diff)
downloadgit-htmldocs-0a90152c2cf35e4ffbc6ff2353496173582ab80d.tar.gz
Autogenerated HTML docs for v1.7.5-rc3
Diffstat (limited to 'git-svn.txt')
-rw-r--r--git-svn.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/git-svn.txt b/git-svn.txt
index 4aa6404f4..30a67486d 100644
--- a/git-svn.txt
+++ b/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.