diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-06-24 18:29:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-25 00:38:34 -0700 |
| commit | 9a99c087da7cd6b4a41c19df3053542f645315c5 (patch) | |
| tree | e639c4ffdc84d047d993722cac034c7c7ddf56e9 /git-reset.sh | |
| parent | 29f4ad867cd15f4029c280c417f4a0866d5229a9 (diff) | |
| download | git-9a99c087da7cd6b4a41c19df3053542f645315c5.tar.gz | |
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>
Diffstat (limited to 'git-reset.sh')
0 files changed, 0 insertions, 0 deletions