Files
git-mirror/Documentation
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
..
2026-02-09 12:09:10 -08:00
2025-12-14 17:04:37 +09:00
2025-10-02 12:26:12 -07:00
2025-12-05 14:49:56 +09:00
2026-01-13 05:41:17 -08:00
2025-12-16 09:42:44 +09:00