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 /git-merge.sh | |
| parent | GIT 1.5.2 (diff) | |
| parent | Add colour support in rebase and merge tree diff stats output. (diff) | |
| download | tgif-5610c6e381f54b7733d344010edc6ed20ec15761.tar.xz | |
Merge branch 'jb/statcolor'
* jb/statcolor:
Add colour support in rebase and merge tree diff stats output.
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge.sh b/git-merge.sh index 7ebbce4bdb..351676f6d4 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 ;; |