Junio C Hamano 444b8548b1 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
2021-10-12 13:51:38 -07:00
..
2020-07-30 19:18:06 -07:00
2021-02-25 16:43:29 -08:00
2021-04-20 11:09:50 -07:00
2021-06-04 07:50:26 +09:00
2021-01-06 15:10:49 -08:00
2020-10-16 12:30:45 -07:00
2021-02-25 16:43:30 -08:00
2021-02-25 16:43:30 -08:00
2021-07-28 13:17:59 -07:00
2020-03-24 15:04:43 -07:00
2021-05-07 12:47:41 +09:00
2021-06-02 07:34:27 +09:00
2021-07-28 13:17:58 -07:00
2021-04-14 13:47:21 -07:00
2020-03-24 15:04:44 -07:00
2020-05-13 12:19:18 -07:00
2021-07-22 11:54:30 -07:00
2021-06-02 10:12:03 +09:00
2021-04-07 16:54:08 -07:00
2020-07-30 19:18:06 -07:00
2021-05-07 12:47:41 +09:00
2021-01-25 14:19:19 -08:00
2021-07-30 12:14:27 -07:00
2021-07-16 17:42:53 -07:00
2020-07-30 19:18:06 -07:00
2020-08-11 18:04:11 -07:00