From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 12 Oct 2021 20:51:38 +0000 (-0700)
Subject: Merge branch 'jk/commit-edit-fixup-fix' into maint
X-Git-Tag: v2.33.1~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=444b8548b1bb8cec8fc885455eba2e0efcca780f;p=thirdparty%2Fgit.git

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

"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
---

444b8548b1bb8cec8fc885455eba2e0efcca780f