diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-19 01:47:56 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-19 01:47:56 +0300 |
commit | 223a1bfb5821387981c700654e4edd2443c5a7fc (patch) | |
tree | ae4464af9b68e958f7c7991bce7a96f515054487 /rebase-interactive.h | |
parent | 0ef08090d2a391e0ce037eafd2b391e3f76b1060 (diff) | |
parent | 17919c3585ba9df9c65ea4a5f7300543dfba5f9f (diff) |
Merge branch 'js/retire-preserve-merges'
The "--preserve-merges" option of "git rebase" has been removed.
* js/retire-preserve-merges:
sequencer: restrict scope of a formerly public function
rebase: remove a no-longer-used function
rebase: stop mentioning the -p option in comments
rebase: remove obsolete code comment
rebase: drop the internal `rebase--interactive` command
git-svn: drop support for `--preserve-merges`
rebase: drop support for `--preserve-merges`
pull: remove support for `--rebase=preserve`
tests: stop testing `git rebase --preserve-merges`
remote: warn about unhandled branch.<name>.rebase values
t5520: do not use `pull.rebase=preserve`
Diffstat (limited to 'rebase-interactive.h')
-rw-r--r-- | rebase-interactive.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/rebase-interactive.h b/rebase-interactive.h index dc2cf0ee12..7239c60f79 100644 --- a/rebase-interactive.h +++ b/rebase-interactive.h @@ -16,6 +16,4 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo); int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_list); -int check_todo_list_from_file(struct repository *r); - #endif |