![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 10 Jul 2006 06:47:39 +0000 (23:47 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 10 Jul 2006 06:47:39 +0000 (23:47 -0700) | ||
| commit | fc93dbbfc91d5214b03101e057ba16f329763ef9 | |
| tree | 92f316a91500a941941fba6e97b00c1d00151080 | tree | snapshot |
| parent | e6ff54a261d72dd43c0755bae09a4970ec2620a1 | commit | diff |
| parent | 3a895e0268537da731f5efe914ece5e7eac35ef3 | commit | diff |
Merge branch 'ew/diff'
* ew/diff:
templates/hooks--update: replace diffstat calls with git diff --stat
diff: do not use configuration magic at the core-level
Update diff-options and config documentation.
diff.c: --no-color to defeat diff.color configuration.
diff.c: respect diff.renames config option
* ew/diff:
templates/hooks--update: replace diffstat calls with git diff --stat
diff: do not use configuration magic at the core-level
Update diff-options and config documentation.
diff.c: --no-color to defeat diff.color configuration.
diff.c: respect diff.renames config option
| builtin-log.c | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |