X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-gui%2Flib%2Foption.tcl;h=aa9f783afd3c848eb3460c8ee1ff6840478637db;hb=4b7f59af2a5b072a0a3950c956842e4d6223a167;hp=b29e14e64dd305922f82556e8e445be42a9fbb38;hpb=4f01d0f92db5cb38aaaab83adb50557beb35fb91;p=git.git

diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index b29e14e64..aa9f783af 100644
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -55,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
@@ -94,6 +94,11 @@ $copyright" \
 		append v ", Tk version $tk_patchLevel"
 	}
 
+	set d {}
+	append d "git wrapper: $::_git\n"
+	append d "git exec dir: [gitexec]\n"
+	append d "git-gui lib: $oguilib"
+
 	label $w.vers \
 		-text $v \
 		-padx 5 -pady 5 \
@@ -103,6 +108,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} \
@@ -174,8 +188,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}}
+		{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}}
 		} {