![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | David Aguilar <davvid@gmail.com> | |
| Mon, 9 Mar 2009 09:12:36 +0000 (02:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 12 Mar 2009 04:54:59 +0000 (21:54 -0700) | ||
| commit | 2464456a6ac9216d59d9e2cf0d86fee072f63cf8 | |
| tree | 39211d813d41105b2d3079df9238811da162c254 | tree | snapshot |
| parent | f4e52f0babdb3ec655a168801e613688a7942839 | commit | diff |
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>
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>
| contrib/difftool/git-difftool | diff | blob | history | |
| contrib/difftool/git-difftool-helper | diff | blob | history | |
| contrib/difftool/git-difftool.txt | diff | blob | history |