@matheusbsbs / matheus-bagliano / commits / fc8ce406fa
Fork 0

git-gui: Expose the merge.diffstat configuration option

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>

Shawn O. Pearce committed May 28, 2007 at 17:58 UTC fc8ce406fac73536a14611ce871a06db5a5a22b3
2 files changed +2
git-gui.sh
+1
@@ -1262,6 +1262,7 @@ proc apply_config {} {
1262 }
1263 }
1264
1265 +set default_config(merge.diffstat) true
1266 set default_config(merge.summary) false
1267 set default_config(merge.verbosity) 2
1268 set default_config(user.name) {}
lib/option.tcl
+1
@@ -184,6 +184,7 @@ proc do_options {} {
184
185 {b merge.summary {Summarize Merge Commits}}
186 {i-1..5 merge.verbosity {Merge Verbosity}}
187 + {b merge.diffstat {Show Diffstat After Merge}}
188
189 {b gui.trustmtime {Trust File Modification Timestamps}}
190 {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}