diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-05 22:52:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-05 22:52:14 (GMT) |
| commit | ac7f41fb8c9fb07adfc1e54f0ec6a7af247c8e23 (patch) | |
| tree | b5b134e8252cddf0c7bed3bde9c9725598479cb4 /builtin/merge-file.c | |
| parent | 4af7188bc97f70277d0f10d56d5373022b1fa385 (diff) | |
| parent | 776f184893d2861a729aa4b91d69931036e03e4b (diff) | |
| download | git-ac7f41fb8c9fb07adfc1e54f0ec6a7af247c8e23.zip git-ac7f41fb8c9fb07adfc1e54f0ec6a7af247c8e23.tar.gz git-ac7f41fb8c9fb07adfc1e54f0ec6a7af247c8e23.tar.bz2 | |
Merge branch 'gc/bare-repo-discovery'
Fix-up for what has been merged to 'master' recently.
* gc/bare-repo-discovery:
config.c: NULL check when reading protected config
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions