]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6de2d14 8600b4e)
Merge branch 'yt/merge-file-outside-a-repository'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Feb 2026 21:30:41 +0000 (13:30 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Feb 2026 21:30:41 +0000 (13:30 -0800)
commit73f29c8ca98c34283599889a91559e35b015182c
treea4603ff9b85e76fb987dd0cfc5d4fb79fe951bdctree
parent6de2d1493aec7dac6e34d7fb69721f951b5e5dc6commit | diff
parent8600b4ec9ef9577408194a99066c356f38139b06commit | diff
Merge branch 'yt/merge-file-outside-a-repository'

"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
Unnamed repository; edit this file 'description' to name the repository.