summaryrefslogtreecommitdiff
path: root/git-gui/lib/option.tcl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-27 21:09:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-27 21:09:25 (GMT)
commit392f1300911120fbaa4b77c737fe13e205726aca (patch)
tree15e0e21eeef25ca4e49d1d413d85c9885338bf15 /git-gui/lib/option.tcl
parentb0320eaf6a25fbc4adf35d611c27006e6d853aa8 (diff)
parentc7f7457026dc2f6979842f81cc17098579fec8d8 (diff)
downloadgit-392f1300911120fbaa4b77c737fe13e205726aca.zip
git-392f1300911120fbaa4b77c737fe13e205726aca.tar.gz
git-392f1300911120fbaa4b77c737fe13e205726aca.tar.bz2
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: "Stage Line": Treat independent changes in adjacent lines better git-gui: Fix "Stage/Unstage Line" with one line of context. git-gui: Correct 'Visualize Branches' on Mac OS X to start gitk git-gui: Look for gitk in $PATH, not $LIBEXEC/git-core Add a menu item to invoke full copy detection in blame. Kill the blame back-end on window close. Add options to control the search for copies in blame. Fix pre-commit hooks under MinGW/MSYS
Diffstat (limited to 'git-gui/lib/option.tcl')
-rw-r--r--git-gui/lib/option.tcl2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index 9270512..ffb3f00 100644
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -123,6 +123,8 @@ 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.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
+ {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
{i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
{i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
{t gui.newbranchtemplate {mc "New Branch Name Template"}}