diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-05-14 04:22:34 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-15 10:57:32 +0900 |
| commit | 082ef75b7bfc90ac236afbb857a9552a026832b8 (patch) | |
| tree | 9d98be566e0a0651332e2b5789de13eb68df36a7 /.gitignore | |
| parent | sequencer: the `am` and `rebase--interactive` scripts are gone (diff) | |
| download | tgif-082ef75b7bfc90ac236afbb857a9552a026832b8.tar.xz | |
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 '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index bcee4fda81..4470d7cfc0 100644 --- a/.gitignore +++ b/.gitignore @@ -122,7 +122,6 @@ /git-range-diff /git-read-tree /git-rebase -/git-rebase--common /git-rebase--preserve-merges /git-receive-pack /git-reflog |