]> git.ipfire.org Git - thirdparty/git.git/commit
rebase: fold git-rebase--common into the -p backend
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 31 Jul 2019 15:18:41 +0000 (08:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2019 19:24:06 +0000 (12:24 -0700)
commit5efed0ecf936596377c241aa0e0bd40839bafbd5
tree1b69cc6b705e846172937709700780f418731e8f
parent68b54f669de27c66e42793977df5b4d5a4a3fc5b
rebase: fold git-rebase--common into the -p backend

The only remaining scripted part of `git rebase` is the
`--preserve-merges` backend. Meaning: there is little reason to keep the
"library of common rebase functions" as a separate file.

While moving the functions to `git-rebase--preserve-merges.sh`, we also
drop the `move_to_original_branch` function that is no longer used.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
.gitignore
Makefile
builtin/rebase.c
git-rebase--common.sh [deleted file]
git-rebase--preserve-merges.sh