Add colour support in rebase and merge tree diff stats output.
authorJames Bowes <jbowes@dangerouslyinc.com>
Sat, 5 May 2007 20:48:54 +0000 (16:48 -0400)
committerJunio C Hamano <junkio@cox.net>
Thu, 10 May 2007 22:25:01 +0000 (15:25 -0700)
commitfefe49d134b4dadf3a184ba7a8e48388f3c15a24
tree748adefe0e26e13b7cd67b7faf2da75a4d6731ab
parent843142ada000a992fa87bd2dc7796501332a52d9
Add colour support in rebase and merge tree diff stats output.

The rebase and merge commands used diff-tree to display the summary stats of
what files had changed from the operation. diff-tree does not read the
diff ui configuration options, so the diff.color setting was not used.

Have rebase and merge call diff rather than diff-tree, which does read the
diff ui options.

Signed-off-by: James Bowes <jbowes@dangerouslyinc.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge.sh
git-rebase.sh