From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Apr 2019 17:14:24 +0000 (+0900)
Subject: Merge branch 'js/rebase-deprecate-preserve-merges'
X-Git-Tag: v2.22.0-rc0~125
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=fa1b86e45743fd5895c33adcd3769782e608bb40;p=git.git

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
---

fa1b86e45743fd5895c33adcd3769782e608bb40