summaryrefslogtreecommitdiff
path: root/t/lib-httpd
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:03:28 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-21 15:03:28 -0700
commit0d9f9424ad12c8e9e71db45776f6bf4a143b90f3 (patch)
tree91cc0d2c5d178f32beb6376a2364f40d255b4798 /t/lib-httpd
parentMerge branch 'dt/gc-ignore-old-gc-logs' into maint (diff)
parentremote: ignore failure to remove missing branch.<name>.merge (diff)
downloadtgif-0d9f9424ad12c8e9e71db45776f6bf4a143b90f3.tar.xz
Merge branch 'rl/remote-allow-missing-branch-name-merge' into maint
"git remote rm X", when a branch has remote X configured as the value of its branch.*.remote, tried to remove branch.*.remote and branch.*.merge and failed if either is unset. * rl/remote-allow-missing-branch-name-merge: remote: ignore failure to remove missing branch.<name>.merge
Diffstat (limited to 't/lib-httpd')
0 files changed, 0 insertions, 0 deletions