From: Junio C Hamano Date: Mon, 13 Dec 2010 05:49:50 +0000 (-0800) Subject: Merge branch 'mz/maint-rebase-stat-config' X-Git-Tag: v1.7.4-rc0~64 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/25756cff935b9ef11f429bd5d05aa27045679d52?hp=6758af89e4bf3f767e189da3e09c3c939162872d Merge branch 'mz/maint-rebase-stat-config' * mz/maint-rebase-stat-config: rebase: only show stat if configured to true --- diff --git a/git-rebase.sh b/git-rebase.sh index 0e9d52a500..9a6d7a4730 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -49,7 +49,8 @@ do_merge= dotest="$GIT_DIR"/rebase-merge prec=4 verbose= -diffstat=$(git config --bool rebase.stat) +diffstat= +test "$(git config --bool rebase.stat)" = true && diffstat=t git_am_opt= rebase_root= force_rebase=