From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Oct 2021 22:43:13 +0000 (-0700)
Subject: Merge branch 'ab/sh-retire-rebase-preserve-merges'
X-Git-Tag: v2.34.0-rc0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=942843e8dd3acd895c4179587ca83bebd857d811;p=thirdparty%2Fgit.git

Merge branch 'ab/sh-retire-rebase-preserve-merges'

Code clean-up to remove unused helpers.

* ab/sh-retire-rebase-preserve-merges:
  git-sh-setup: remove messaging supporting --preserve-merges
  git-sh-i18n: remove unused eval_ngettext()
---

942843e8dd3acd895c4179587ca83bebd857d811