tree 75ae7fdfcddad4fd8039ca66b498cc8128bedc4c
parent 20fe798b1bf301f78485a56381ad8dad48b2c670
parent 427c3bd28ab504443d0eea6fc6aa27b0c0748372
author Junio C Hamano <gitster@pobox.com> 1554830064 +0900
committer Junio C Hamano <gitster@pobox.com> 1554830064 +0900

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