Merge branch 'jc/svn-auth-providers-unusable-at-1.6.12'

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index b0e13e5bf47113bc8f54e16742943ed125d6e388..147fa1a8e002daba2a465ed1f56c88838500cb53 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -238,6 +238,10 @@ leave out at most one of A and B, in which case it defaults to HEAD.
        will be reset to where it was when the rebase operation was
        started.
 
+--keep-empty::
+       Keep the commits that do not change anything from its
+       parents in the result.
+
 --skip::
        Restart the rebasing process by skipping the current patch.