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>
Tilman Vogel committed
Jan 21, 2011 at 11:59 UTC
54531e7c7aeca965c23e60a6805059826a8de75a
3 files changed
+3
git-gui.sh
+1
@@ -850,6 +850,7 @@ set default_config(gui.fastcopyblame) false
850
set default_config(gui.copyblamethreshold) 40
851
set default_config(gui.blamehistoryctx) 7
852
set default_config(gui.diffcontext) 5
853
+set default_config(gui.diffopts) {}
854
set default_config(gui.commitmsgwidth) 75
855
set default_config(gui.newbranchtemplate) {}
856
set default_config(gui.spellingdictionary) {}
lib/diff.tcl
+1
@@ -309,6 +309,7 @@ proc start_show_diff {cont_info {add_opts {}}} {
309
310
lappend cmd -p
311
lappend cmd --color
312
+ set cmd [concat $cmd $repo_config(gui.diffopts)]
313
if {$repo_config(gui.diffcontext) >= 1} {
314
lappend cmd "-U$repo_config(gui.diffcontext)"
315
}
lib/option.tcl
+1
@@ -153,6 +153,7 @@ proc do_options {} {
153
{i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
154
{i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}}
155
{i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
156
+ {t gui.diffopts {mc "Additional Diff Parameters"}}
157
{i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
158
{t gui.newbranchtemplate {mc "New Branch Name Template"}}
159
{c gui.encoding {mc "Default File Contents Encoding"}}