diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-07-31 15:18:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-31 19:24:06 (GMT) |
| commit | 5efed0ecf936596377c241aa0e0bd40839bafbd5 (patch) | |
| tree | 1b69cc6b705e846172937709700780f418731e8f /builtin/rebase.c | |
| parent | 68b54f669de27c66e42793977df5b4d5a4a3fc5b (diff) | |
| download | git-5efed0ecf936596377c241aa0e0bd40839bafbd5.zip git-5efed0ecf936596377c241aa0e0bd40839bafbd5.tar.gz git-5efed0ecf936596377c241aa0e0bd40839bafbd5.tar.bz2 | |
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>
Diffstat (limited to 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 4dd76ee..74a60e8 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1163,8 +1163,7 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action) } strbuf_addf(&script_snippet, - ". git-sh-setup && . git-rebase--common &&" - " . %s && %s", backend, backend_func); + ". git-sh-setup && . %s && %s", backend, backend_func); argv[0] = script_snippet.buf; status = run_command_v_opt(argv, RUN_USING_SHELL); |