Commit 37e80a2
rebase: handle --strategy via imply_merge() as well
At least after the successive trimming of enum rebase_type mentioned in
the previous commit, this code did exactly what imply_merge() does, so
just call it instead.
Suggested-by: Junio C Hamano <[email protected]>
Signed-off-by: Oswald Buddenhagen <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>1 parent a5b5740 commit 37e80a2
1 file changed
+1
-12
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1490 | 1490 | | |
1491 | 1491 | | |
1492 | 1492 | | |
1493 | | - | |
1494 | | - | |
1495 | | - | |
1496 | | - | |
1497 | | - | |
1498 | | - | |
1499 | | - | |
1500 | | - | |
1501 | | - | |
1502 | | - | |
1503 | | - | |
1504 | | - | |
| 1493 | + | |
1505 | 1494 | | |
1506 | 1495 | | |
1507 | 1496 | | |
| |||
0 commit comments