aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-rebase.txt
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-06-24 18:29:49 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-25 00:38:34 -0700
commitd5e673b60be2eb99153276366b6b5ff3277805df (patch)
tree60375d772dba1e3a4e9c43d93b6350146d0e789a /Documentation/git-rebase.txt
parent9e4bc7dd1bb9d92491c475cec55147fa0b3f954d (diff)
downloadgit-d5e673b60be2eb99153276366b6b5ff3277805df.tar.gz
git-d5e673b60be2eb99153276366b6b5ff3277805df.tar.xz
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 <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-rebase.txt')
-rw-r--r--Documentation/git-rebase.txt1
1 files changed, 0 insertions, 1 deletions
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