summaryrefslogtreecommitdiff
path: root/lib/diff.tcl
diff options
context:
space:
mode:
authorTilman Vogel <tilman.vogel@web.de>2011-01-21 11:59:45 +0100
committerPat Thoyts <patthoyts@users.sourceforge.net>2011-11-05 00:38:01 +0000
commit54531e7c7aeca965c23e60a6805059826a8de75a (patch)
tree6c835606e9c5f588103e388ea8aae96b2582dbed /lib/diff.tcl
parent3f2fb173ace1afa7040d31cd3239c6a9cac49006 (diff)
downloadgit-54531e7c7aeca965c23e60a6805059826a8de75a.tar.gz
git-gui: add config value gui.diffopts for passing additional diff options
Signed-off-by: Tilman Vogel <tilman.vogel@web.de> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'lib/diff.tcl')
-rw-r--r--lib/diff.tcl1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl
index f5ed5d1dc6..ec4405567a 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -309,6 +309,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
lappend cmd -p
lappend cmd --color
+ set cmd [concat $cmd $repo_config(gui.diffopts)]
if {$repo_config(gui.diffcontext) >= 1} {
lappend cmd "-U$repo_config(gui.diffcontext)"
}