Merge branch 'js/rebase-deprecate-preserve-merges'
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Nov 2019 09:02:13 +0000 (18:02 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Nov 2019 09:02:13 +0000 (18:02 +0900)
commit0c51181ffb178a6581ecb471091cbd2d0c48f165
tree475fe1611bbc83b20280597491f20f2ab3ac50ba
parent8f40d897834c9c60ebab3d34607a5b8a7f33163d
parentfeebd2d256adffa6a1e31832266ee9466a63c0c2
Merge branch 'js/rebase-deprecate-preserve-merges'

"git rebase --preserve-merges" has been marked as deprecated; this
release stops advertising it in the "git rebase -h" output.

* js/rebase-deprecate-preserve-merges:
  rebase: hide --preserve-merges option
builtin/rebase.c