summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-12 10:19:57 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-12 10:19:57 -0700
commit8702fee6171abb2e353499fa0cecba90ad5f277f (patch)
tree64366b7892e0fa5aac9c9526f77f532535c7f548 /git-mergetool--lib.sh
parentc2d53586ddfdde1ff625fe58299dc81db5e6f408 (diff)
parent18322badc2b3b7f49f79da5273e003e9c0c4f549 (diff)
downloadgit-8702fee6171abb2e353499fa0cecba90ad5f277f.tar.gz
Merge branch 'jl/maint-fetch-submodule-check-fix' into maint
* jl/maint-fetch-submodule-check-fix: fetch: skip on-demand checking when no submodules are configured
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions