From: Junio C Hamano Date: Tue, 19 Apr 2011 18:49:13 +0000 (-0700) Subject: Sync with 1.7.4.5 X-Git-Tag: v1.7.5-rc3~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0e73bb4dfc15472d0671c37fe03d577cd0af2380?ds=inline;hp=-c Sync with 1.7.4.5 Signed-off-by: Junio C Hamano --- 0e73bb4dfc15472d0671c37fe03d577cd0af2380 diff --combined Documentation/git-svn.txt index 4aa6404f4e,4f262a935d..30a67486d2 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@@ -217,6 -217,13 +217,13 @@@ config key: svn.commiturl (overwrites a Using this option for any other purpose (don't ask) is very strongly discouraged. + --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. @@@ -648,16 -655,6 +655,16 @@@ svn-remote..rewriteUUID: where the original UUID is not available via either useSvmProps or useSvnsyncProps. +svn-remote..pushurl:: + + Similar to git's 'remote..pushurl', this key is designed + to be used in cases where 'url' points to an SVN repository + via a read-only transport, to provide an alternate read/write + transport. It is assumed that both keys point to the same + repository. Unlike 'commiturl', 'pushurl' is a base path. If + either 'commiturl' or 'pushurl' could be used, 'commiturl' + takes precedence. + svn.brokenSymlinkWorkaround:: This disables potentially expensive checks to workaround broken symlinks checked into SVN by broken clients. Set this @@@ -888,6 -885,10 +895,6 @@@ SEE ALS -------- linkgit:git-rebase[1] -Author ------- -Written by Eric Wong . - -Documentation -------------- -Written by Eric Wong . +GIT +--- +Part of the linkgit:git[1] suite