Merge branch 'ab/sh-retire-rebase-preserve-merges'
commit942843e8dd3acd895c4179587ca83bebd857d811
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Oct 2021 22:43:13 +0000 (29 15:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Oct 2021 22:43:13 +0000 (29 15:43 -0700)
tree032b770f67a9ceb629aab5bb2d9e47c61e9b0d8b
parent192a3fa31dbb3bb5dbcc64b6587a2763839d784b
parentc1e10b2dce28b434127870ed09293cf9adc9fcc2
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()