diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-20 02:18:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-20 02:18:37 -0700 |
| commit | 5610c6e381f54b7733d344010edc6ed20ec15761 (patch) | |
| tree | b5e26b5072c132809656269ad3932e7808cb8ce7 | |
| parent | aba170cdb4874b72dd619e6f7bbc13c33295f831 (diff) | |
| parent | fefe49d134b4dadf3a184ba7a8e48388f3c15a24 (diff) | |
| download | git-5610c6e381f54b7733d344010edc6ed20ec15761.tar.gz git-5610c6e381f54b7733d344010edc6ed20ec15761.tar.xz | |
Merge branch 'jb/statcolor'
* jb/statcolor:
Add colour support in rebase and merge tree diff stats output.
| -rwxr-xr-x | git-merge.sh | 3 | ||||
| -rwxr-xr-x | git-rebase.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index 7ebbce4bd..351676f6d 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 ;; diff --git a/git-rebase.sh b/git-rebase.sh index 2dc2c4fe9..61770b5a2 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -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. |