From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Apr 2020 20:42:50 +0000 (-0700)
Subject: Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'
X-Git-Tag: v2.27.0-rc0~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f72e06703b14b3bccaaeee97ac82257dff67749c;p=thirdparty%2Fgit.git

Merge branch 'ag/rebase-merge-allow-ff-under-abbrev-command'

"git rebase" with the merge backend did not work well when the
rebase.abbreviateCommands configuration was set.

* ag/rebase-merge-allow-ff-under-abbrev-command:
  t3432: test `--merge' with `rebase.abbreviateCommands = true', too
  sequencer: don't abbreviate a command if it doesn't have a short form
---

f72e06703b14b3bccaaeee97ac82257dff67749c