diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-07 01:03:22 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-07 01:03:22 +0200 |
| commit | 1b118da8bd1878d78589afd9f755b9d52a9579ad (patch) | |
| tree | 3bef12e4e07a0be6331a305522ae278a2b8cabe5 /git-gui/lib/option.tcl | |
| parent | Mention the fact that 'git annotate' is only for backward compatibility. (diff) | |
| parent | git-gui: Fix diff parsing for lines starting with "--" or "++" (diff) | |
| download | git-1b118da8bd1878d78589afd9f755b9d52a9579ad.tar.xz git-1b118da8bd1878d78589afd9f755b9d52a9579ad.zip | |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
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"}} } { |