summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorJames Bowes <jbowes@dangerouslyinc.com>2007-05-05 20:48:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-10 22:25:01 (GMT)
commitfefe49d134b4dadf3a184ba7a8e48388f3c15a24 (patch)
tree748adefe0e26e13b7cd67b7faf2da75a4d6731ab /git-merge.sh
parent843142ada000a992fa87bd2dc7796501332a52d9 (diff)
downloadgit-fefe49d134b4dadf3a184ba7a8e48388f3c15a24.zip
git-fefe49d134b4dadf3a184ba7a8e48388f3c15a24.tar.gz
git-fefe49d134b4dadf3a184ba7a8e48388f3c15a24.tar.bz2
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>
Diffstat (limited to 'git-merge.sh')
-rwxr-xr-xgit-merge.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh
index 7ebbce4..351676f 100755
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -90,7 +90,8 @@ finish () {
?*)
case "$no_summary" in
'')
- git-diff-tree --stat --summary -M "$head" "$1"
+ # We want color (if set), but no pager
+ GIT_PAGER='' git-diff --stat --summary -M "$head" "$1"
;;
esac
;;