diff options
| author |  Alex Riesen <raa.lkml@gmail.com> | 2007-05-23 23:01:29 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-05-24 21:37:08 -0700 |
| commit | 51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9 (patch) | |
| tree | d64d7dea3213b1c474e39d623b86acb39cbb9dc0 /Documentation/git-checkout-index.txt | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-checkout-index.txt')
0 files changed, 0 insertions, 0 deletions