diff options
| author | Eric Wong <normalperson@yhbt.net> | 2006-06-24 18:29:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-25 00:38:34 -0700 |
| commit | d5e673b60be2eb99153276366b6b5ff3277805df (patch) | |
| tree | 60375d772dba1e3a4e9c43d93b6350146d0e789a /t/t4013/diff.diff-tree_--patch-with-stat_initial | |
| parent | rebase: cleanup rebasing with --merge (diff) | |
| download | git-d5e673b60be2eb99153276366b6b5ff3277805df.tar.gz git-d5e673b60be2eb99153276366b6b5ff3277805df.zip | |
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>
Diffstat (limited to 't/t4013/diff.diff-tree_--patch-with-stat_initial')
0 files changed, 0 insertions, 0 deletions