From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Sep 2021 20:49:27 +0000 (-0700)
Subject: Merge branch 'jk/commit-edit-fixup-fix'
X-Git-Tag: v2.34.0-rc0~223
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e21f716f89d190017fa675738e9e7cc1a74680a;p=thirdparty%2Fgit.git

Merge branch 'jk/commit-edit-fixup-fix'

"git commit --fixup" now works with "--edit" again, after it was
broken in v2.32.

* jk/commit-edit-fixup-fix:
  commit: restore --edit when combined with --fixup
---

6e21f716f89d190017fa675738e9e7cc1a74680a