Junio C Hamano
8778fa8b4f
Merge branch 'en/ort-becomes-the-default'
...
Use `ort` instead of `recursive` as the default merge strategy.
* en/ort-becomes-the-default:
Update docs for change of default merge backend
Change default merge backend from recursive to ort
2021-08-30 16:06:01 -07:00
..
2021-08-02 14:06:39 -07:00
2021-03-27 15:13:12 -07:00
2021-08-24 15:33:23 -07:00
2021-08-30 16:06:01 -07:00
2019-05-09 00:37:27 +09:00
2020-03-29 09:25:38 -07:00
2019-10-06 12:25:16 +09:00
2021-02-24 15:21:25 -08:00
2020-08-04 18:34:02 -07:00
2021-07-28 13:18:02 -07:00
2021-07-26 12:17:16 -07:00
2021-02-23 13:33:02 -08:00
2019-12-13 12:18:07 -08:00
2021-04-28 13:34:44 +09:00
2021-08-11 12:36:18 -07:00
2020-02-18 13:53:30 -08:00
2021-06-30 14:57:22 -07:00
2019-12-04 10:10:37 -08:00
2021-05-10 15:06:22 +09:00
2018-05-25 17:16:47 +09:00
2021-04-07 22:20:33 -07:00
2018-09-21 09:28:58 -07:00
2020-09-19 15:56:06 -07:00
2020-10-08 14:01:15 -07:00
2020-08-28 14:06:06 -07:00
2021-01-12 14:04:39 -08:00
2021-02-25 16:43:30 -08:00
2020-06-08 18:06:28 -07:00
2021-08-02 14:46:22 -07:00
2021-03-03 16:43:06 -08:00
2019-11-07 13:42:00 +09:00
2020-03-17 15:02:23 -07:00
2021-01-12 14:04:40 -08:00
2019-04-02 13:57:00 +09:00
2020-10-27 15:09:51 -07:00
2020-10-20 11:57:40 -07:00
2019-10-11 14:24:46 +09:00
2021-04-01 12:58:58 -07:00
2018-12-26 15:29:30 -08:00
2020-11-02 13:17:39 -08:00
2020-04-03 11:37:22 -07:00
2021-06-28 13:08:25 -07:00
2021-07-20 14:55:06 -07:00
2018-05-25 17:16:47 +09:00
2020-05-08 14:25:01 -07:00
2021-04-10 23:36:34 -07:00
2021-04-10 23:36:34 -07:00
2019-03-13 11:14:22 +09:00
2021-05-17 15:56:29 +09:00
2020-09-20 21:30:26 -07:00
2020-09-21 13:37:03 -07:00
2021-07-12 13:55:29 -07:00
2021-02-22 13:35:49 -08:00
2020-06-25 14:19:23 -07:00
2020-10-04 12:56:29 -07:00
2018-04-09 14:15:02 +09:00
2021-07-30 09:08:12 -07:00
2020-10-20 12:22:25 -07:00
2018-10-29 10:17:01 +09:00
2021-07-26 12:01:25 -07:00
2020-09-25 10:59:44 -07:00
2021-05-11 15:27:23 +09:00
2021-01-20 19:10:42 -08:00
2021-02-10 23:43:55 -08:00
2021-04-10 23:36:34 -07:00
2019-10-06 09:45:02 +09:00
2019-05-28 10:47:42 -07:00
2020-08-04 18:34:01 -07:00
2019-03-07 09:25:32 +09:00
2021-02-22 12:07:40 -08:00
2018-05-02 17:03:33 +09:00
2020-08-31 11:44:33 -07:00
2021-03-01 14:02:57 -08:00
2020-12-13 15:53:50 -08:00
2019-01-28 10:57:44 -08:00
2021-05-04 12:09:43 +09:00
2021-06-08 13:34:48 +09:00
2021-01-23 11:48:20 -08:00
2020-06-25 09:18:53 -07:00
2020-11-04 14:04:44 -08:00
2021-05-10 15:06:22 +09:00
2021-04-16 13:36:55 -07:00
2019-09-09 11:05:51 -07:00
2019-09-09 11:05:52 -07:00
2021-07-22 11:54:30 -07:00
2021-02-09 14:09:16 -08:00
2021-03-13 15:34:32 -08:00
2021-04-10 23:36:34 -07:00
2018-04-09 14:15:07 +09:00
2021-04-01 13:07:37 -07:00
2018-05-02 17:03:33 +09:00
2020-08-03 12:40:09 -07:00
2021-04-10 23:36:34 -07:00
2021-07-08 13:15:03 -07:00
2017-07-28 14:41:32 -07:00
2018-05-02 17:03:33 +09:00
2021-08-30 16:06:01 -07:00
2021-07-16 17:42:53 -07:00
2019-01-07 15:29:34 -08:00
2021-02-17 17:21:41 -08:00
2020-04-06 13:42:43 -07:00
2021-08-05 15:35:02 -07:00
2019-09-09 11:05:52 -07:00
2018-10-22 13:32:54 +09:00
2019-04-22 11:14:46 +09:00
2019-04-01 14:00:53 +09:00
2019-04-01 14:00:53 +09:00
2020-10-27 11:40:33 -07:00
2021-07-08 13:15:03 -07:00
2019-09-05 13:01:48 -07:00
2018-05-02 17:03:33 +09:00
2019-07-09 15:25:44 -07:00
2020-04-06 13:42:43 -07:00
2020-10-07 09:49:05 -07:00
2021-02-17 16:25:29 -08:00
2020-12-12 23:35:51 -08:00
2020-10-20 11:57:40 -07:00
2021-04-08 14:18:03 -07:00
2021-05-17 07:06:13 +09:00
2018-05-02 17:03:33 +09:00
2018-05-02 17:03:33 +09:00
2021-02-10 13:34:51 -08:00
2019-04-10 12:05:03 +09:00
2020-08-17 10:50:14 -07:00
2019-01-10 10:29:05 -08:00
2020-12-21 13:47:32 -08:00
2021-03-30 12:57:48 -07:00
2021-05-22 17:56:46 +09:00
2021-02-19 19:36:47 -08:00
2020-06-24 09:14:21 -07:00
2021-04-10 23:36:34 -07:00
2020-10-08 09:25:29 -07:00
2021-02-19 19:36:47 -08:00
2017-04-20 22:05:37 -07:00
2021-01-09 22:57:24 -08:00
2020-11-16 13:44:01 -08:00
2019-05-15 14:07:37 +09:00
2019-01-23 11:37:29 -08:00
2018-05-02 17:03:33 +09:00
2019-03-13 11:14:22 +09:00
2021-07-28 13:17:58 -07:00
2021-05-07 12:47:39 +09:00
2021-05-04 11:52:03 +09:00
2020-03-17 15:02:24 -07:00
2020-01-08 08:56:40 -08:00
2020-08-04 18:34:01 -07:00
2021-03-22 14:00:24 -07:00
2020-06-25 09:18:53 -07:00
2021-08-05 15:35:02 -07:00
2021-03-01 09:02:01 -08:00
2021-07-06 17:20:02 -07:00
2020-11-01 15:54:14 -08:00
2021-05-04 11:52:03 +09:00
2021-05-04 11:52:03 +09:00
2021-04-10 23:36:34 -07:00
2020-07-06 22:09:13 -07:00
2019-11-10 18:02:14 +09:00
2018-08-31 14:04:06 -07:00
2020-10-04 12:54:07 -07:00
2019-05-07 13:04:48 +09:00
2021-07-30 09:08:12 -07:00
2021-04-08 15:54:26 -07:00
2019-06-24 12:37:21 -07:00
2020-07-18 13:43:34 -07:00
2021-05-19 21:11:49 +09:00
2021-02-24 15:21:25 -08:00
2017-12-12 16:49:40 -08:00
2020-11-01 15:54:14 -08:00
2020-11-01 15:54:14 -08:00
2021-04-10 23:36:34 -07:00
2021-04-10 23:36:34 -07:00
2021-04-10 23:36:34 -07:00
2021-05-24 18:08:22 +09:00
2020-03-29 09:25:38 -07:00
2020-03-29 09:25:38 -07:00
2019-09-16 12:20:39 -07:00
2021-08-30 16:06:01 -07:00
2021-08-05 15:35:02 -07:00
2021-06-09 09:22:54 +09:00
2020-11-30 13:55:54 -08:00
2020-08-17 10:50:14 -07:00
2021-05-16 21:05:24 +09:00
2020-11-04 14:04:44 -08:00
2020-09-30 14:52:00 -07:00
2020-09-18 15:41:56 -07:00
2020-07-08 22:08:54 -07:00
2021-07-22 13:05:56 -07:00
2021-05-18 10:08:03 +09:00
2019-07-02 12:08:08 -07:00
2020-10-20 11:57:40 -07:00
2021-07-22 12:53:14 -07:00
2019-10-04 09:26:42 +09:00
2019-10-21 12:02:39 +09:00
2020-03-31 16:08:02 -07:00
2021-08-05 15:35:02 -07:00