diff options
| author |  Alban Gruin <alban.gruin@gmail.com> | 2018-05-28 14:34:20 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-01 09:34:48 +0900 |
| commit | ef64bb328df9c131c6c454ad65169fa3972da512 (patch) | |
| tree | bbf4785068ae5d8ebec27aa3f6edc8a830c8703e /t/t4051/dummy.c | |
| parent | rebase: introduce a dedicated backend for --preserve-merges (diff) | |
| download | tgif-ef64bb328df9c131c6c454ad65169fa3972da512.tar.xz | |
rebase: strip unused code in git-rebase--preserve-merges.sh
This removes the code coming from git-rebase--interactive.sh that is not
needed by preserve-merges, and changes the header comment accordingly.
In a following commit, the -p code from git-rebase--interactive.sh will
be stripped out. As preserve-merges’ successor is already in the works,
this will be the only script to be converted.
This also seems to fix a bug where a failure in
`pick_one_preserving_merges()` would fallback to the non-preserve-merges
`pick_one()`.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Diffstat (limited to 't/t4051/dummy.c')
0 files changed, 0 insertions, 0 deletions