diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-02 15:30:39 -0700 |
| commit | bd1a32d5c8ec5987824acb63694361d082ce9092 (patch) | |
| tree | 2d4cdf74b1f280cb9585af314928a2396763b65e /notes-merge.c | |
| parent | Merge branch 'bc/object-id' (diff) | |
| parent | fsck: downgrade gitmodulesParse default to "info" (diff) | |
| download | tgif-bd1a32d5c8ec5987824acb63694361d082ce9092.tar.xz | |
Merge branch 'jk/fsck-gitmodules-gently'
Recent "security fix" to pay attention to contents of ".gitmodules"
while accepting "git push" was a bit overly strict than necessary,
which has been adjusted.
* jk/fsck-gitmodules-gently:
fsck: downgrade gitmodulesParse default to "info"
fsck: split ".gitmodules too large" error from parse failure
fsck: silence stderr when parsing .gitmodules
config: add options parameter to git_config_from_mem
config: add CONFIG_ERROR_SILENT handler
config: turn die_on_error into caller-facing enum
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions