Junio C Hamano 9142fce9b0
Merge branch 'ah/rebase-merges-config' ...
Streamline --rebase-merges command line option handling and
introduce rebase.merges configuration variable.
* ah/rebase-merges-config:
rebase: add a config option for --rebase-merges
rebase: deprecate --rebase-merges=""
rebase: add documentation and test for --no-rebase-merges
2023-04-04 14:28:28 -07:00
2023-02-06 15:03:34 -08:00
2023-03-08 09:28:42 -08:00
2019-06-06 09:33:42 -07:00
2021-06-28 10:05:13 -07:00
2022-04-29 11:20:55 -07:00
2023-01-31 08:57:48 -08:00
2021-04-19 11:57:05 -07:00
2022-02-09 15:38:36 -08:00
2021-11-01 13:48:08 -07:00
2021-02-25 15:10:41 -08:00
2022-10-30 19:58:40 -04:00
2020-11-25 12:30:18 -08:00
2022-09-07 09:46:06 -07:00
2022-09-07 09:46:06 -07:00
2022-02-08 09:49:20 -08:00
2023-01-07 07:46:14 +09:00
2023-01-31 08:57:48 -08:00
2020-09-27 14:22:41 -07:00
2023-03-09 08:37:27 -08:00
2022-10-25 15:44:18 -07:00
2022-10-05 11:05:23 -07:00
2022-05-26 15:48:26 -07:00
2023-02-27 13:42:43 -08:00
2022-09-07 09:46:05 -07:00
2021-08-27 12:45:45 -07:00
2021-08-14 11:20:49 -07:00
2022-06-17 10:38:26 -07:00
2022-07-17 14:23:42 -07:00
2023-01-07 07:46:14 +09:00
2021-02-05 13:49:55 -08:00
2019-05-07 13:04:47 +09:00
2022-09-16 09:21:44 -07:00
2022-08-04 14:12:23 -07:00
2021-02-09 23:09:29 -08:00
2021-12-01 14:45:59 -08:00
2022-10-25 17:11:38 -07:00
2022-09-07 09:46:06 -07:00
2022-09-05 18:33:39 -07:00
2022-10-06 20:00:04 -04:00
2021-09-07 21:45:32 -07:00
2022-11-14 16:55:50 -05:00
2023-03-27 09:32:49 -07:00
2020-08-27 12:47:47 -07:00
2022-03-28 10:25:53 -07:00
2022-05-26 15:48:26 -07:00
2022-06-27 08:37:36 -07:00
2022-07-14 15:08:29 -07:00
2022-09-07 09:46:05 -07:00
2022-03-01 23:37:48 -08:00
2022-01-27 18:00:37 -08:00
2019-06-21 09:35:00 -07:00
2022-02-04 08:16:39 -08:00
2020-03-18 12:42:09 -07:00
2020-03-18 12:42:09 -07:00
2021-01-04 11:27:48 -08:00
2022-12-25 16:24:23 +09:00
2022-07-14 15:08:29 -07:00
2021-11-19 09:05:25 -08:00
9142fce9b0