| commit | 6e21f716f89d190017fa675738e9e7cc1a74680a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Sep 2021 20:49:27 +0000 (3 13:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 3 Sep 2021 20:49:27 +0000 (3 13:49 -0700) | ||
| tree | c40a0caddb625b949806c323c66d404e98ff2588 | treesnapshot (tar.gz zip) |
| parent | a5619d4f8d91a179d0e21aa16fda52fb4f0f7eaf | commitdiff |
| parent | 8ef6aad664715c16caf6e36a7f6b174a06574477 | commitdiff |
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
"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