From: Shawn O. Pearce <spearce@spearce.org>
Date: Fri, 1 Jun 2007 03:34:24 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~44^2~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71a9db534a6bb4a6e9824c01b557a96ccaae0e89;p=git.git

Merge branch 'maint'

* maint:
  git-gui: Allow as few as 0 lines of diff context
---

71a9db534a6bb4a6e9824c01b557a96ccaae0e89
diff --cc lib/option.tcl
index 4924b9aa5,11dd9be6b..ba2a723fc
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@@ -184,11 -171,9 +184,11 @@@ proc do_options {} 
  
  		{b merge.summary {Summarize Merge Commits}}
  		{i-1..5 merge.verbosity {Merge Verbosity}}
 +		{b merge.diffstat {Show Diffstat After Merge}}
  
  		{b gui.trustmtime  {Trust File Modification Timestamps}}
 +		{b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
- 		{i-1..99 gui.diffcontext {Number of Diff Context Lines}}
+ 		{i-0..99 gui.diffcontext {Number of Diff Context Lines}}
  		{t gui.newbranchtemplate {New Branch Name Template}}
  		} {
  		set type [lindex $option 0]