diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-02-17 13:30:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-17 13:30:41 -0800 |
| commit | 73f29c8ca98c34283599889a91559e35b015182c (patch) | |
| tree | a4603ff9b85e76fb987dd0cfc5d4fb79fe951bdc /contrib/persistent-https | |
| parent | 6de2d1493aec7dac6e34d7fb69721f951b5e5dc6 (diff) | |
| parent | 8600b4ec9ef9577408194a99066c356f38139b06 (diff) | |
| download | git-73f29c8ca98c34283599889a91559e35b015182c.tar.gz git-73f29c8ca98c34283599889a91559e35b015182c.zip | |
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
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions