git.99rst.org Git - git.git/commit

author	Alex Riesen <redacted>
	Wed, 23 May 2007 21:01:29 +0000 (23:01 +0200)
committer	Junio C Hamano <redacted>
	Fri, 25 May 2007 04:37:08 +0000 (21:37 -0700)
commit	51e7ecf4ecb506fb36cd5933cb7b78fb4b315ac9
tree	d64d7dea3213b1c474e39d623b86acb39cbb9dc0	tree \| snapshot
parent	18bece43675ea0dc9022a7868865e02808b7af7f	commit \| diff

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

Documentation/git-merge.txt		diff \| blob \| history
Documentation/merge-options.txt		diff \| blob \| history
git-merge.sh		diff \| blob \| history
git-pull.sh		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT