• Alban Gruin's avatar
    rebase: use the new git-rebase--preserve-merges.sh · 6d98d0c0
    Alban Gruin authored
    Create a new type of rebase, "preserve-merges", used when rebase is
    called with -p.
    Before that, the type for preserve-merges was "interactive", and some
    places of this script compared $type to "interactive". Instead, the code
    now checks if $interactive_rebase is empty or not, as it is set to
    "explicit" when calling an interactive rebase (and, possibly, one of its
    submodes), and "implied" when calling one of its
    submodes (eg. preserve-merges) *without* interactive rebase.
    It also detects the presence of the directory "$merge_dir"/rewritten
    left by the preserve-merges script when calling rebase --continue,
    --skip, etc., and, if it exists, sets the rebase mode to
    preserve-merges. In this case, interactive_rebase is set to "explicit",
    as "implied" would break some tests.
    Signed-off-by: default avatarAlban Gruin <alban.gruin@gmail.com>
git-rebase.sh 18.1 KB