X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-rebase.txt;h=9d7bcaa38cc5c13e29c00ddd18c64202e98cb5f8;hb=2cda1a214e9d2e362242027b4b622ecb3d9260de;hp=c339c4525c500f29d51063a34f1c7d238b37c2e6;hpb=fba6e3f039ad51a0a7f152f4948e6bc926bec3c4;p=git.git

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index c339c4525..9d7bcaa38 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -108,7 +108,6 @@ OPTIONS
 
 --skip::
 	Restart the rebasing process by skipping the current patch.
-	This does not work with the --merge option.
 
 --merge::
 	Use merging strategies to rebase.  When the recursive (default) merge