summaryrefslogtreecommitdiff
path: root/git-rebase.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-14 07:35:31 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-14 07:35:31 -0800
commite0cbf12bf7d8b46292774ac91db8757d60b0f4df (patch)
tree3b88eb397a32f941e0ad3446d6fdd9a1ca402755 /git-rebase.sh
parent187b259dce5c5db17ef4cac09b163753e85e62cc (diff)
parent9474a029d5817a9a5a0f96cf257fa95befd93e62 (diff)
downloadgit-e0cbf12bf7d8b46292774ac91db8757d60b0f4df.tar.gz
Merge branch 'mz/maint-rebase-stat-config' into maint
* mz/maint-rebase-stat-config: rebase: only show stat if configured to true
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-xgit-rebase.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-rebase.sh b/git-rebase.sh
index 10a238ae3c..ec08f9cff5 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=