From d5e673b60be2eb99153276366b6b5ff3277805df Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 24 Jun 2006 18:29:49 -0700 Subject: rebase: allow --skip to work with --merge Now that we control the merge base selection, we won't be forced into rolling things in that we wanted to skip beforehand. Also, add a test to ensure this all works as intended. Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index c339c4525c..9d7bcaa38c 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 -- cgit v1.2.1