Merge branch 'sv/objfixes'

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 820a2c308e056b2008f8883b9aebfa5bd6dbe4c7..c0d7d9597b8f569a1e996072bef667f517e74bd2 100644 (file)
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -119,6 +119,9 @@ and have no uncommitted changes.
        alternative to HEAD.
        This is advantageous over 'set-tree' (below) because it produces
        cleaner, more linear history.
++
+--no-rebase;;
+       After committing, do not rebase or reset.
 --
 
 'log'::