Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mz/maint-rebase-stat-config' into maint
author
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Dec 2010 15:35:31 +0000
(07:35 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 14 Dec 2010 15:35:31 +0000
(07:35 -0800)
* mz/maint-rebase-stat-config:
rebase: only show stat if configured to true
git-rebase.sh
patch
|
blob
|
history
raw
(from parent 1:
187b259
)
diff --git
a/git-rebase.sh
b/git-rebase.sh
index 10a238ae3cc942bc021db18195b7098e2866c266..ec08f9cff515995b5aff972d6ccc16df5eea4507 100755
(executable)
--- 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=