summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-28 15:21:00 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-28 15:21:00 -0700
commite90020cdb3273af3b0c7915c0aacf16b19bbf994 (patch)
tree7877275ba126cfe2cea62bfb9f6ec33c3680bf14 /git-mergetool--lib.sh
parentMerge branch 'js/submodule-relative' (diff)
parentcompletion: respect $GIT_DIR (diff)
downloadtgif-e90020cdb3273af3b0c7915c0aacf16b19bbf994.tar.xz
Merge branch 'fc/git-prompt-script'
Split a rather heavy-ish "git completion" script out to create a separate "git prompting" script, to help lazy-autoloading of the completion part while making prompting part always available.
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions