Junio C Hamano
ee1ced4120
Merge branch 'yt/merge-file-outside-a-repository' into next
...
"git merge-file" can be run outside a repository, but it ignored
all configuration, even the per-user ones. The command now uses
available configuration files to find its customization.
* yt/merge-file-outside-a-repository:
merge-file: honor merge.conflictStyle outside of a repository
2026-02-10 12:40:04 -08:00
..
2025-10-02 12:26:11 -07:00
2026-02-06 21:07:53 -08:00
2025-07-01 14:58:24 -07:00
2025-09-24 11:53:50 -07:00
2025-11-19 10:55:39 -08:00
2026-02-04 13:35:48 -08:00
2025-12-03 00:16:05 -08:00
2025-04-15 08:24:35 -07:00
2024-12-13 07:33:36 -08:00
2026-01-21 08:29:00 -08:00
2025-07-23 08:15:18 -07:00
2025-07-23 08:15:22 -07:00
2025-07-23 08:15:22 -07:00
2025-01-17 13:30:03 -08:00
2025-07-23 08:15:22 -07:00
2025-07-23 08:15:22 -07:00
2026-01-09 18:36:18 -08:00
2025-09-29 11:40:35 -07:00
2026-01-29 09:32:50 -08:00
2025-07-23 08:15:18 -07:00
2025-10-22 10:40:11 -07:00
2026-01-15 05:32:31 -08:00
2026-02-06 21:07:53 -08:00
2025-12-05 14:49:59 +09:00
2025-10-16 14:42:39 -07:00
2025-07-23 08:15:20 -07:00
2026-01-12 11:56:56 -08:00
2025-07-23 08:15:22 -07:00
2026-01-15 05:32:31 -08:00
2025-04-15 08:24:35 -07:00
2025-07-23 08:15:18 -07:00
2025-07-23 08:15:18 -07:00
2025-03-03 08:17:47 -08:00
2026-02-06 21:07:53 -08:00
2025-08-09 17:22:01 -07:00
2025-07-01 14:46:38 -07:00
2026-01-29 09:32:50 -08:00
2026-01-09 06:40:07 -08:00
2025-06-04 08:52:25 -07:00
2026-01-25 22:27:34 -08:00
2025-08-11 09:19:40 -07:00
2025-08-22 13:13:20 -07:00
2024-12-06 20:20:04 +09:00
2026-01-21 08:28:58 -08:00
2025-07-23 08:15:22 -07:00
2026-02-06 21:07:53 -08:00
2025-01-17 13:30:03 -08:00
2026-01-09 06:40:07 -08:00
2025-07-23 08:15:22 -07:00
2025-07-23 08:15:22 -07:00
2026-01-13 05:41:17 -08:00
2026-01-15 13:02:38 -08:00
2026-01-09 06:40:07 -08:00
2025-04-24 17:25:34 -07:00
2025-07-23 08:15:22 -07:00
2026-02-06 21:07:53 -08:00
2026-01-15 05:32:31 -08:00
2025-09-08 14:54:35 -07:00
2025-11-04 07:32:25 -08:00
2026-01-09 18:36:18 -08:00
2024-12-18 10:44:31 -08:00
2025-01-17 13:30:03 -08:00
2026-01-15 05:32:31 -08:00
2026-02-07 17:04:26 -08:00
2025-01-17 13:30:03 -08:00
2026-02-06 11:45:33 -08:00
2025-08-08 11:13:12 -07:00
2026-02-06 21:07:53 -08:00
2026-02-06 21:07:53 -08:00
2025-08-05 11:53:55 -07:00
2025-07-16 22:16:15 -07:00
2025-09-12 10:41:18 -07:00
2025-07-23 08:15:18 -07:00
2025-12-25 08:29:27 +09:00
2025-08-21 13:47:00 -07:00
2026-01-29 09:32:50 -08:00
2025-10-30 08:00:19 -07:00
2025-09-19 10:02:55 -07:00
2026-01-09 06:07:21 -08:00
2025-08-05 11:53:55 -07:00
2026-01-15 05:32:31 -08:00
2025-09-16 17:59:53 -07:00
2025-10-14 12:56:09 -07:00
2026-01-09 18:36:18 -08:00
2026-01-15 05:32:31 -08:00
2026-02-06 11:22:59 -08:00
2025-10-15 10:29:28 -07:00
2025-10-02 12:26:12 -07:00
2025-01-17 13:30:03 -08:00
2025-01-17 13:30:03 -08:00
2026-02-05 17:52:49 -08:00
2026-01-14 06:29:24 -08:00
2025-11-04 07:32:24 -08:00
2026-01-13 05:41:16 -08:00
2025-12-30 12:58:19 +09:00
2025-07-23 08:15:18 -07:00
2026-01-09 18:36:18 -08:00
2026-01-15 05:32:31 -08:00
2025-11-19 10:55:39 -08:00
2025-09-18 10:07:00 -07:00
2025-07-23 08:15:22 -07:00
2025-07-23 08:15:22 -07:00
2026-02-05 17:52:49 -08:00
2026-01-15 05:32:31 -08:00
2026-01-30 08:58:12 -08:00
2025-11-04 07:32:25 -08:00
2026-01-30 09:59:26 -08:00
2026-02-06 21:07:53 -08:00
2025-07-23 08:15:18 -07:00
2026-02-05 15:41:58 -08:00
2025-07-23 08:15:22 -07:00
2025-12-29 22:02:53 +09:00
2025-07-23 08:15:22 -07:00
2025-11-03 12:18:48 -08:00
2025-09-16 11:37:06 -07:00
2026-01-25 22:27:33 -08:00
2025-07-23 08:15:22 -07:00
2025-11-19 17:41:03 -08:00
2025-11-19 17:41:03 -08:00
2025-08-21 13:46:59 -07:00
2025-07-23 08:15:22 -07:00
2025-07-23 08:15:22 -07:00
2025-12-29 22:02:53 +09:00
2026-01-30 09:59:25 -08:00
2025-07-23 08:15:22 -07:00