| commit | 51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9 | |
| author | Alex Riesen <raa.lkml@gmail.com> | |
| Wed, 23 May 2007 21:01:29 +0000 (23 23:01 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 25 May 2007 04:37:08 +0000 (24 21:37 -0700) | ||
| tree | d64d7dea3213b1c474e39d623b86acb39cbb9dc0 | treesnapshot (tar.gz zip) |
| parent | 18bece43675ea0dc9022a7868865e02808b7af7f | commitdiff |
Add a configuration option to control diffstat after merge
The diffstat can be controlled either with command-line options
(--summary|--no-summary) or with merge.diffstat. The default is
left as it was: diffstat is active by default.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
The diffstat can be controlled either with command-line options
(--summary|--no-summary) or with merge.diffstat. The default is
left as it was: diffstat is active by default.
Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| Documentation/git-merge.txt | diffblobblamehistory | |
| Documentation/merge-options.txt | diffblobblamehistory | |
| git-merge.sh | diffblobblamehistory | |
| git-pull.sh | diffblobblamehistory |