Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: support rebase --preserve-merges
[gitweb.git]
/
Documentation
/
git-svn.txt
diff --git
a/Documentation/git-svn.txt
b/Documentation/git-svn.txt
index 34ee785064128bce0feb2cfc86d3040b42a8f428..0d52997b8d3389ff88973b910185b2484309aaab 100644
(file)
--- a/
Documentation/git-svn.txt
+++ b/
Documentation/git-svn.txt
@@
-572,6
+572,8
@@
config key: svn.repackflags
--merge::
-s<strategy>::
--strategy=<strategy>::
+-p::
+--preserve-merges::
These are only used with the 'dcommit' and 'rebase' commands.
+
Passed directly to 'git rebase' when using 'dcommit' if a