Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'mz/maint-rebase-stat-config'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Dec 2010 05:49:50 +0000
(21:49 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 13 Dec 2010 05:49:50 +0000
(21:49 -0800)
* mz/maint-rebase-stat-config:
rebase: only show stat if configured to true
git-rebase.sh
patch
|
blob
|
history
raw
(from parent 1:
6758af8
)
diff --git
a/git-rebase.sh
b/git-rebase.sh
index 0e9d52a5007ed12a23d52a157a7118a50b7693f8..9a6d7a4730a3ca81a4060f73b2be516fe235bb43 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=