diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2011-04-19 12:24:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-19 18:29:45 (GMT) |
| commit | ccc2fcf54cd6cfa9f15c110d064e10aa8d71ddb1 (patch) | |
| tree | 4cbeb65cde4156cd9bab46a8bb09d7f90bb19f93 /Documentation/git-svn.txt | |
| parent | 810cae53e0f622d6804f063c04a83dbc3a11b7ca (diff) | |
| download | git-ccc2fcf54cd6cfa9f15c110d064e10aa8d71ddb1.zip git-ccc2fcf54cd6cfa9f15c110d064e10aa8d71ddb1.tar.gz git-ccc2fcf54cd6cfa9f15c110d064e10aa8d71ddb1.tar.bz2 | |
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>
Diffstat (limited to 'Documentation/git-svn.txt')
| -rw-r--r-- | Documentation/git-svn.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index e161a40..4f262a9 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. |