dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-03 22:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase: allow --skip to work with --merge

Browse Source 
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>
This commit is contained in:
Eric Wong
2006-06-24 18:29:49 -07:00
committed by Junio C Hamano
parent 9e4bc7dd1b
commit d5e673b60b
3 changed files with 73 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/git-rebase.txt
View File

@@ -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