Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index ea80df009226d0ff14e8fe423abfe3d7a94ef56b..5e1346e601faf90114e9c62f11144f812835e872 100644 (file)
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -123,7 +123,10 @@ 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"}}
-               {i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
+               {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}}
+               {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}}
+               {i-1..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"}}
                } {
                set type [lindex $option 0]