mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-25 19:04:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

git-gui: Expose the merge.diffstat configuration option

Browse Source 
Recently git-merge learned to avoid generating the diffstat after
a merge by reading the merge.diffstat configuration option.  By
default this option is assumed to be true, as that is the old
behavior.  However we can force it to false by setting it as a
standard boolean option.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2007-05-28 17:58:07 -04:00
parent aa252f194b
commit fc8ce406fa
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-gui.sh
View File

@ -1262,6 +1262,7 @@ proc apply_config {} {
} }
} }
set default_config(merge.diffstat) true
set default_config(merge.summary) false set default_config(merge.summary) false
set default_config(merge.verbosity) 2 set default_config(merge.verbosity) 2
set default_config(user.name) {} set default_config(user.name) {}

1
lib/option.tcl
View File

@ -184,6 +184,7 @@ proc do_options {} {
{b merge.summary {Summarize Merge Commits}} {b merge.summary {Summarize Merge Commits}}
{i-1..5 merge.verbosity {Merge Verbosity}} {i-1..5 merge.verbosity {Merge Verbosity}}
{b merge.diffstat {Show Diffstat After Merge}}
{b gui.trustmtime {Trust File Modification Timestamps}} {b gui.trustmtime {Trust File Modification Timestamps}}
{b gui.pruneduringfetch {Prune Tracking Branches During Fetch}} {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}