diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-12 21:49:50 -0800 |
| commit | 25756cff935b9ef11f429bd5d05aa27045679d52 (patch) | |
| tree | b08560307f3a398c1d7e86cc61d7c8f58a849331 | |
| parent | 6758af89e4bf3f767e189da3e09c3c939162872d (diff) | |
| parent | 9474a029d5817a9a5a0f96cf257fa95befd93e62 (diff) | |
| download | git-25756cff935b9ef11f429bd5d05aa27045679d52.tar.gz | |
Merge branch 'mz/maint-rebase-stat-config'
* mz/maint-rebase-stat-config:
rebase: only show stat if configured to true
| -rwxr-xr-x | git-rebase.sh | 3 |
1 files changed, 2 insertions, 1 deletions
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= |