summaryrefslogtreecommitdiff
path: root/mergetools/winmerge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-31 14:09:46 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-31 14:09:46 -0700
commit3296e1a93a4540e083ffe28710d3601da95f06b5 (patch)
tree9e4a76051e275e004aeac60abaab164d8cb9abde /mergetools/winmerge
parentMerge branch 'bn/http-cookiefile-config' into maint (diff)
parentsubmodule deinit: require '--all' instead of '.' for all submodules (diff)
downloadtgif-3296e1a93a4540e083ffe28710d3601da95f06b5.tar.xz
Merge branch 'sb/submodule-deinit-all' into maint
Correct faulty recommendation to use "git submodule deinit ." when de-initialising all submodules, which would result in a strange error message in a pathological corner case. * sb/submodule-deinit-all: submodule deinit: require '--all' instead of '.' for all submodules
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions