git-gui: Reword meaning of merge.summary.
OK, its official, I'm not reading documentation as well as I should be. Core Git's merge.summary configuration option is used to control the generation of the text appearing within the merge commit itself. It is not (and never has been) used to default the --no-summary command line option, which disables the diffstat at the end of the merge. I completely blame Git for naming two unrelated options almost the exact same thing. But its my own fault for allowing git-gui to confuse the two. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Jan 27, 2007 at 02:31 UTC
6b90d39186dbfabfff94692d33d0a6e94f02016c
1 file changed
+2
-6
git-gui.sh
+2
-6
@@ -2693,10 +2693,6 @@ proc start_local_merge_action {w} {
2693
global HEAD ui_status_value current_branch
2694
2695
set cmd [list git merge]
2696
- if {![is_config_true merge.summary]} {
2697
- lappend cmd --no-summary
2698
- }
2699
-
2696
set names {}
2697
set revcnt 0
2698
foreach i [$w.source.l curselection] {
@@ -3772,7 +3768,7 @@ proc do_options {} {
3768
3769
set optid 0
3770
foreach option {
3775
- {b merge.summary {Show Merge Summary}}
3771
+ {b merge.summary {Summarize Merge Commits}}
3772
{i-1..5 merge.verbosity {Merge Verbosity}}
3773
3774
{b gui.trustmtime {Trust File Modification Timestamps}}
@@ -4153,7 +4149,7 @@ proc apply_config {} {
4149
}
4150
}
4151
4156
-set default_config(merge.summary) true
4152
+set default_config(merge.summary) false
4153
set default_config(merge.verbosity) 2
4154
set default_config(gui.trustmtime) false
4155
set default_config(gui.diffcontext) 5