![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Eric Wong <normalperson@yhbt.net> | |
| Sun, 25 Jun 2006 01:29:47 +0000 (18:29 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 25 Jun 2006 07:38:34 +0000 (00:38 -0700) | ||
| commit | 9a99c087da7cd6b4a41c19df3053542f645315c5 | |
| tree | e639c4ffdc84d047d993722cac034c7c7ddf56e9 | tree | snapshot |
| parent | 29f4ad867cd15f4029c280c417f4a0866d5229a9 | commit | diff |
rebase: allow --merge option to handle patches merged upstream
Enhance t3401-rebase-partial to test with --merge as well as
the standard am -3 strategy.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Enhance t3401-rebase-partial to test with --merge as well as
the standard am -3 strategy.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-rebase.sh | diff | blob | history | |
| t/t3401-rebase-partial.sh | diff | blob | history |