James Bowes fefe49d134 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>

2007-05-10 15:25:01 -07:00

8.3 KiB

Executable File

Raw Blame History

View Raw