From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Jun 2022 22:09:28 +0000 (-0700)
Subject: Merge branch 'po/rebase-preserve-merges'
X-Git-Tag: v2.37.0-rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=589bc0942b2c14e9361deedc468a233e0571136f;p=thirdparty%2Fgit.git

Merge branch 'po/rebase-preserve-merges'

Various error messages that talk about the removal of
"--preserve-merges" in "rebase" have been strengthened, and "rebase
--abort" learned to get out of a state that was left by an earlier
use of the option.

* po/rebase-preserve-merges:
  rebase: translate a die(preserve-merges) message
  rebase: note `preserve` merges may be a pull config option
  rebase: help users when dying with `preserve-merges`
  rebase.c: state preserve-merges has been removed
---

589bc0942b2c14e9361deedc468a233e0571136f