Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index 17fcc65f78b5e09b77738508ca4db76d9a05a8f0..ae19a8f9cf3901a808c85f0c028fbf44813d30b5 100644 (file)
--- a/git-gui/lib/option.tcl
+++ b/git-gui/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)
@@ -52,7 +55,7 @@ proc save_config {} {
 }
 
 proc do_about {} {
-       global appvers copyright
+       global appvers copyright oguilib
        global tcl_patchLevel tk_patchLevel
 
        set w .about_dialog
@@ -91,6 +94,10 @@ $copyright" \
                append v ", Tk version $tk_patchLevel"
        }
 
+       set d {}
+       append d "git exec dir: [gitexec]\n"
+       append d "git-gui lib: $oguilib"
+
        label $w.vers \
                -text $v \
                -padx 5 -pady 5 \
@@ -100,6 +107,15 @@ $copyright" \
                -relief solid
        pack $w.vers -side top -fill x -padx 5 -pady 5
 
+       label $w.dirs \
+               -text $d \
+               -padx 5 -pady 5 \
+               -justify left \
+               -anchor w \
+               -borderwidth 1 \
+               -relief solid
+       pack $w.dirs -side top -fill x -padx 5 -pady 5
+
        menu $w.ctxm -tearoff 0
        $w.ctxm add command \
                -label {Copy} \
@@ -171,9 +187,11 @@ proc do_options {} {
 
                {b merge.summary {Summarize Merge Commits}}
                {i-1..5 merge.verbosity {Merge Verbosity}}
+               {b merge.diffstat {Show Diffstat After Merge}}
 
                {b gui.trustmtime  {Trust File Modification Timestamps}}
-               {i-1..99 gui.diffcontext {Number of Diff Context Lines}}
+               {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
+               {i-0..99 gui.diffcontext {Number of Diff Context Lines}}
                {t gui.newbranchtemplate {New Branch Name Template}}
                } {
                set type [lindex $option 0]