summaryrefslogtreecommitdiff
path: root/git-gui/lib/option.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-02 16:28:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-02 16:28:30 (GMT)
commitc01a29c74ff991faf3012882fbf676b182b8893f (patch)
treeaea256176929d2bc66f77fde7dad2f7d7298154e /git-gui/lib/option.tcl
parentac2e1e632e50c682305fee902b32b1a23ce71546 (diff)
parent2810a58dba6d06f4d1816fb06500c117feebd830 (diff)
downloadgit-c01a29c74ff991faf3012882fbf676b182b8893f.zip
git-c01a29c74ff991faf3012882fbf676b182b8893f.tar.gz
git-c01a29c74ff991faf3012882fbf676b182b8893f.tar.bz2
Merge git://repo.or.cz/git-gui into pt/git-gui
* git://repo.or.cz/git-gui: git-gui: fix size and position of window panes on startup git-gui: mc cannot be used before msgcat has been loaded git-gui: use textconv filter for diff and blame git-gui: Avoid using the <<Copy>> binding as a menu accelerator on win32 git-gui: fix shortcut creation on cygwin git-gui: fix PATH environment for mingw development environment git-gui: fix usage of _gitworktree when creating shortcut for windows git-gui: fix "Explore Working Copy" for Windows again git-gui: fix usage of themed widgets variable git-gui: Handle failure of core.worktree to identify the working directory. git-gui: check whether systems nice command works or disable it
Diffstat (limited to 'git-gui/lib/option.tcl')
-rw-r--r--git-gui/lib/option.tcl1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index d4c5e45..3807c8d 100644
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -148,6 +148,7 @@ proc do_options {} {
{b gui.trustmtime {mc "Trust File Modification Timestamps"}}
{b gui.pruneduringfetch {mc "Prune Tracking Branches During Fetch"}}
{b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
+ {b gui.textconv {mc "Use Textconv For Diffs and Blames"}}
{b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
{i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
{i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}}