| commit | 6b90d39186dbfabfff94692d33d0a6e94f02016c | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Sat, 27 Jan 2007 07:31:01 +0000 (27 02:31 -0500) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Sat, 27 Jan 2007 07:31:01 +0000 (27 02:31 -0500) | ||
| tree | 420f89041cd14a5cb664104ec524720191355747 | treesnapshot (tar.gz zip) |
| parent | c539449b2df0381de1d34c70b093b68370e89a4e | commitdiff |
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>
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>
| git-gui.sh | diffblobblamehistory |