summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2009-03-09 02:12:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-11 21:54:59 -0700
commit2464456a6ac9216d59d9e2cf0d86fee072f63cf8 (patch)
tree39211d813d41105b2d3079df9238811da162c254 /git-pull.sh
parentUpdate release notes to 1.6.3 (diff)
downloadtgif-2464456a6ac9216d59d9e2cf0d86fee072f63cf8.tar.xz
contrib/difftool: use a separate config namespace for difftool commands
Some users have different mergetool and difftool settings, so teach difftool to read config vars from the difftool.* namespace. This allows having distinct configurations for the diff and merge scenarios. We don't want to force existing users to set new values for no reason so difftool falls back to existing mergetool config variables when the difftool equivalents are not defined. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
0 files changed, 0 insertions, 0 deletions