![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Eric Wong <normalperson@yhbt.net> | |
| Sun, 25 Jun 2006 01:29:49 +0000 (18:29 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 25 Jun 2006 07:38:34 +0000 (00:38 -0700) | ||
| commit | d5e673b60be2eb99153276366b6b5ff3277805df | |
| tree | 60375d772dba1e3a4e9c43d93b6350146d0e789a | tree | snapshot |
| parent | 9e4bc7dd1bb9d92491c475cec55147fa0b3f954d | commit | diff |
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>
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>
| Documentation/git-rebase.txt | diff | blob | history | |
| git-rebase.sh | diff | blob | history | |
| t/t3403-rebase-skip.sh | [new file with mode: 0755] | blob |