summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-05-29 14:30:10 -0700
committerJunio C Hamano <gitster@pobox.com>2013-05-29 14:30:10 -0700
commit7ebb906ddd69628fc9874b1266257ae2256b8f14 (patch)
treead17ef0ca7462e48e0279f709c7aa21c23c3cf67 /resolve-undo.c
parent4818cfcdcc8011e5eef353d0f64cd9d2374ea381 (diff)
parent4698c8feb1bb56497215e0c10003dd046df352fa (diff)
downloadgit-7ebb906ddd69628fc9874b1266257ae2256b8f14.tar.gz
Merge branch 'jn/config-ignore-inaccessible'
When $HOME is misconfigured to point at an unreadable directory, we used to complain and die. This loosens the check. * jn/config-ignore-inaccessible: config: allow inaccessible configuration under $HOME
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions