Merge branch 'maint' to sync with 1.5.2.5

diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index ae19a8f9cf3901a808c85f0c028fbf44813d30b5..aa9f783afd3c848eb3460c8ee1ff6840478637db 100644 (file)
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -95,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"
 
@@ -191,6 +192,7 @@ proc do_options {} {
 
                {b gui.trustmtime  {Trust File Modification Timestamps}}
                {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
+               {b gui.matchtrackingbranch {Match Tracking Branches}}
                {i-0..99 gui.diffcontext {Number of Diff Context Lines}}
                {t gui.newbranchtemplate {New Branch Name Template}}
                } {