Junio C Hamano 8775279891
Merge branch 'jn/mergetool-hideresolved-is-optional' ...
Disable the recent mergetool's hideresolved feature by default for
backward compatibility and safety.
* jn/mergetool-hideresolved-is-optional:
doc: describe mergetool configuration in git-mergetool(1)
mergetool: do not enable hideResolved by default
2021-03-14 16:01:41 -07:00
2019-11-14 11:10:04 +09:00
2020-10-03 09:59:19 -07:00
2019-06-06 09:33:42 -07:00
2019-05-16 11:36:23 +09:00
2020-02-10 10:52:10 -08:00
2020-10-08 09:25:29 -07:00
2020-09-30 22:09:13 -07:00
2019-08-11 17:40:07 -07:00
2020-09-18 10:39:22 -07:00
2021-01-15 15:20:28 -08:00
2020-11-25 12:30:18 -08:00
2020-12-08 14:27:35 -08:00
2020-07-30 09:16:49 -07:00
2020-09-25 11:40:42 -07:00
2020-08-18 13:25:05 -07:00
2020-09-27 14:22:41 -07:00
2020-11-21 15:14:38 -08:00
2019-03-07 09:25:32 +09:00
2020-11-21 11:39:55 -08:00
2020-01-15 14:06:06 -08:00
2020-11-25 13:02:15 -08:00
2021-01-04 11:27:48 -08:00
2019-08-13 13:33:55 -07:00
2021-02-05 13:49:55 -08:00
2019-05-07 13:04:47 +09:00
2020-04-16 11:05:48 -07:00
2021-02-05 13:49:53 -08:00
2021-02-09 23:09:29 -08:00
2020-04-10 09:28:02 -07:00
2021-03-13 15:30:29 -08:00
2021-01-25 18:32:44 -08:00
2020-09-25 11:40:42 -07:00
2020-02-10 10:52:10 -08:00
2020-10-03 09:59:19 -07:00
2021-02-24 11:49:10 -08:00
2020-08-27 12:47:47 -07:00
2019-06-25 14:05:38 -07:00
2019-03-18 14:09:54 +09:00
2020-07-23 18:00:34 -07:00
2020-03-05 12:50:28 -08:00
2019-06-21 09:35:00 -07:00
2020-04-06 13:42:43 -07: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
2020-11-11 18:26:52 -08:00
2020-09-27 14:23:20 -07:00
2020-01-22 12:27:08 -08:00
8775279891