mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 16:53:53 +01:00
Code

Merge branch 'jb/statcolor'

Browse Source 
* jb/statcolor:
  Add colour support in rebase and merge tree diff stats output.
This commit is contained in:
Junio C Hamano 2007-05-20 02:18:37 -07:00
commit 5610c6e381
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-merge.sh
View File

@ -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
;;

3
git-rebase.sh
View File

@ -307,7 +307,8 @@ fi
if test -n "$verbose"
then
echo "Changes from $mb to $onto:"
git-diff-tree --stat --summary "$mb" "$onto"
# We want color (if set), but no pager
GIT_PAGER='' git-diff --stat --summary "$mb" "$onto"
fi
# Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.