summaryrefslogtreecommitdiff
path: root/git-gui/lib/option.tcl
diff options
context:
space:
mode:
authorPaul Sherwood <paul.sherwood@codethink.co.uk>2014-04-29 20:37:28 +0000
committerPaul Sherwood <paul.sherwood@codethink.co.uk>2014-04-29 20:37:28 +0000
commite98c205a5c3fb893ffdda3f5e05d1967b4a79c1d (patch)
tree3ecbd4f05ab9601cefa7b322323039795db440a9 /git-gui/lib/option.tcl
parent43efcf42382e87de4aa423e5e1607958ad1717d0 (diff)
parent0bc85abb7aa9b24b093253018801a0fb43d01122 (diff)
downloadgit-baserock/ps/update-git.tar.gz
Merge tag 'v1.9.2' into HEADbaserock/ps/update-git
Git 1.9.2
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 0cf1da1d7e..23c9ae72a4 100644
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -150,6 +150,7 @@ proc do_options {} {
{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-0..100 gui.maxrecentrepo {mc "Maximum Length of Recent Repositories List"}}
{i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
{i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}}
{i-1..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
@@ -159,6 +160,7 @@ proc do_options {} {
{c gui.encoding {mc "Default File Contents Encoding"}}
{b gui.warndetachedcommit {mc "Warn before committing to a detached head"}}
{s gui.stageuntracked {mc "Staging of untracked files"} {list "yes" "no" "ask"}}
+ {b gui.displayuntracked {mc "Show untracked files"}}
} {
set type [lindex $option 0]
set name [lindex $option 1]