git-gui: Fix window manager problems on ion3

[git.git] / lib / option.tcl

diff --git a/lib/option.tcl b/lib/option.tcl
index 4924b9aa56ce70c67331b515b8b508aeb241b6f8..aa9f783afd3c848eb3460c8ee1ff6840478637db 100644 (file)
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -15,6 +15,9 @@ proc save_config {} {
                font configure ${font}bold \
                        -family $global_config_new(gui.$font^^family) \
                        -size $global_config_new(gui.$font^^size)
+               font configure ${font}italic \
+                       -family $global_config_new(gui.$font^^family) \
+                       -size $global_config_new(gui.$font^^size)
                set global_config_new(gui.$name) [font configure $font]
                unset global_config_new(gui.$font^^family)
                unset global_config_new(gui.$font^^size)
@@ -92,6 +95,7 @@ $copyright" \
        }
 
        set d {}
+       append d "git wrapper: $::_git\n"
        append d "git exec dir: [gitexec]\n"
        append d "git-gui lib: $oguilib"
 
@@ -188,7 +192,8 @@ proc do_options {} {
 
                {b gui.trustmtime  {Trust File Modification Timestamps}}
                {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
-               {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
+               {b gui.matchtrackingbranch {Match Tracking Branches}}
+               {i-0..99 gui.diffcontext {Number of Diff Context Lines}}
                {t gui.newbranchtemplate {New Branch Name Template}}
                } {
                set type [lindex $option 0]