diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-03 15:16:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-03 15:16:38 -0700 |
| commit | e9aa24123d0ff8914a34a9f40f23bf736ec2bfb7 (patch) | |
| tree | d472e18b2c3fd15754e50f1511459844a992f740 /git-gui/lib/option.tcl | |
| parent | 7d808125a0197e5660a57f77d14937604b16e39a (diff) | |
| parent | c01a29c74ff991faf3012882fbf676b182b8893f (diff) | |
| download | git-e9aa24123d0ff8914a34a9f40f23bf736ec2bfb7.tar.gz git-e9aa24123d0ff8914a34a9f40f23bf736ec2bfb7.tar.xz | |
Merge branch 'pt/git-gui' into maint
* pt/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.tcl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl index d4c5e45c8..3807c8d28 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)"}} |