diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-06 16:47:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-06 16:47:32 -0700 |
| commit | 4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e (patch) | |
| tree | e5bfb6f6467031660b19a3afeb51cbd732664342 /git-gui/lib/option.tcl | |
| parent | 80d12c23de4fbddfaee2f9bf7fe809f57d02e171 (diff) | |
| parent | aaefbfa66c348a461b3081873ef42819c8b38dac (diff) | |
| download | git-4a09bc966449ca0a7e9a5bb70f91b47debdd7c4e.tar.gz | |
Merge branch 'maint'
* maint:
Update draft release notes for 1.6.0.2
stash: refresh the index before deciding if the work tree is dirty
Mention the fact that 'git annotate' is only for backward compatibility.
"blame -c" should be compatible with "annotate"
git-gui: Fix diff parsing for lines starting with "--" or "++"
git-gui: Fix string escaping in po2msg.sh
git gui: show diffs with a minimum of 1 context line
git-gui: update all remaining translations to French.
git-gui: Update french translation
Diffstat (limited to 'git-gui/lib/option.tcl')
| -rw-r--r-- | git-gui/lib/option.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl index ffb3f00ff0..5e1346e601 100644 --- a/git-gui/lib/option.tcl +++ b/git-gui/lib/option.tcl @@ -125,7 +125,7 @@ proc do_options {} { {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-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"}} } { |