summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-09-27 11:35:43 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-09-27 11:35:43 -0700
commit424aac653acce98f1bfb7f8b7bf36361f558472d (patch)
tree760542d1cc64bfe430938ccd14d2f9a4eeecb5b5 /git-mergetool--lib.sh
parentGit 2.16.4 (diff)
parentGit 2.15.3 (diff)
downloadtgif-424aac653acce98f1bfb7f8b7bf36361f558472d.tar.xz
Sync with 2.15.3
* maint-2.15: Git 2.15.3 Git 2.14.5 submodule-config: ban submodule paths that start with a dash submodule-config: ban submodule urls that start with dash submodule--helper: use "--" to signal end of clone options
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions