diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-14 11:22:34 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-15 01:57:32 (GMT) |
| commit | 082ef75b7bfc90ac236afbb857a9552a026832b8 (patch) | |
| tree | 9d98be566e0a0651332e2b5789de13eb68df36a7 /builtin/rebase.c | |
| parent | c3c003e722317eacd2adf98d1758d7991cb9834f (diff) | |
| download | git-082ef75b7bfc90ac236afbb857a9552a026832b8.zip git-082ef75b7bfc90ac236afbb857a9552a026832b8.tar.gz git-082ef75b7bfc90ac236afbb857a9552a026832b8.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 d5f6f40..9c52144 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); |