kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
6,142 Commits
6 Branches
991 Tags
179 MiB
Commit Graph

2 Commits (cb849b46ac68feea716a45fd1de99cfdd71123d0)

Author SHA1 Message Date
Eric Wong 9a99c087da 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>
 2006-06-25 00:38:34 -07:00
Yann Dirson e77f489edf Add a test for rebase when a change was picked upstream 
This test exercises the standard feature that makes rebase useful.

Signed-off-by: Yann Dirson <ydirson@altern.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
 2006-01-08 12:33:13 -08:00