Merge branch 'js/rebase-deprecate-preserve-merges'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Apr 2019 17:14:24 +0000 (02:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Apr 2019 17:14:24 +0000 (02:14 +0900)
"git rebase --rebase-merges" replaces its old "--preserve-merges"
option; the latter is now marked as deprecated.

* js/rebase-deprecate-preserve-merges:
rebase: deprecate --preserve-merges

1  2 
Documentation/git-rebase.txt
builtin/rebase.c
Simple merge
Simple merge