| commit | 444b8548b1bb8cec8fc885455eba2e0efcca780f | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:38 +0000 (12 13:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Oct 2021 20:51:38 +0000 (12 13:51 -0700) | ||
| tree | 5cabfec2e9a20c65fe3289218e8a7b005f749889 | treesnapshot (tar.gz zip) |
| parent | ee2b241b695ea57a1d6be01291d87c13aad7080c | commitdiff |
| parent | 8ef6aad664715c16caf6e36a7f6b174a06574477 | commitdiff |
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
"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