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)
commitfa1b86e45743fd5895c33adcd3769782e608bb40
tree75ae7fdfcddad4fd8039ca66b498cc8128bedc4c
parent20fe798b1bf301f78485a56381ad8dad48b2c670
parent427c3bd28ab504443d0eea6fc6aa27b0c0748372
Merge branch 'js/rebase-deprecate-preserve-merges'

"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
Documentation/git-rebase.txt
builtin/rebase.c