diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-11 00:52:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-11 00:52:43 -0700 |
| commit | 75d8ff138dd640a117c6aaa625d0f6b835adbd3a (patch) | |
| tree | 3fe3467ed5b90dfef595a324a7134cb2b6f192ef /git-gui/lib/option.tcl | |
| parent | 27c1dbea3e3a23b3c4b3707dfc9a71c3279ae279 (diff) | |
| parent | 32af629ab57869f96f282e7f7839e84d1b8e22ca (diff) | |
| download | git-75d8ff138dd640a117c6aaa625d0f6b835adbd3a.tar.gz git-75d8ff138dd640a117c6aaa625d0f6b835adbd3a.tar.xz | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui: Internalize symbolic-ref HEAD reading logic
git-gui: Expose the merge.diffstat configuration option
git-gui: Allow users to delete remote branches
git-gui: Allow users to rename branches through 'branch -m'
git-gui: Disable tearoff menus on Windows, Mac OS X
git-gui: Provide fatal error if library is unavailable
git-gui: Enable verbose Tcl loading earlier
git-gui: Show the git-gui library path in 'About git-gui'
git-gui: GUI support for running 'git remote prune <name>'
git gui 0.8.0
Diffstat (limited to 'git-gui/lib/option.tcl')
| -rw-r--r-- | git-gui/lib/option.tcl | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl index b29e14e64..ae19a8f9c 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,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 \ @@ -103,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} \ @@ -174,8 +187,10 @@ 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}} {i-0..99 gui.diffcontext {Number of Diff Context Lines}} {t gui.newbranchtemplate {New Branch Name Template}} } { |