summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 593ce2b)
raw | patch | inline | side by side (parent: 593ce2b)
author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | |
Tue, 9 Nov 2010 20:59:00 +0000 (21:59 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Nov 2010 22:49:54 +0000 (14:49 -0800) |
If rebase.stat is set to true, a diffstat should be displayed. If it is
not set, it should default to false. However, if it is explicitly set to
false (or other value), a diffstat is still displayed, which is probably
not what most users would expect. Show diffstat only if it is set
to true.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
not set, it should default to false. However, if it is explicitly set to
false (or other value), a diffstat is still displayed, which is probably
not what most users would expect. Show diffstat only if it is set
to true.
Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-rebase.sh | patch | blob | history |
diff --git a/git-rebase.sh b/git-rebase.sh
index fb4fef7b1d6f7abb08fca562ecaad6e36f671768..6ab95a33e9818ba53ef0d37a0808969410c23cda 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
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=