diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:36:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 22:36:14 -0700 |
| commit | 72d9b222a940c93a8d915c26a4d5d077e23be871 (patch) | |
| tree | b1bfaf4991ee3edf1410ef4e5dff3a5475746795 /git-submodule.sh | |
| parent | e251a7b34a85b0ac8a63a31e899e070ea2a330c7 (diff) | |
| parent | 4f62c2bc577bbb85b65f3261c7fab7ef74def4cd (diff) | |
| download | git-72d9b222a940c93a8d915c26a4d5d077e23be871.tar.gz | |
Merge branch 'sd/log-decorate'
* sd/log-decorate:
log.decorate: only ignore it under "log --pretty=raw"
script with rev-list instead of log
log --pretty/--oneline: ignore log.decorate
log.decorate: usability fixes
Add `log.decorate' configuration variable.
git_config_maybe_bool()
Conflicts:
builtin/log.c
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 3319b836b2..8175cb279d 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -650,7 +650,7 @@ cmd_summary() { range=$sha1_dst fi GIT_DIR="$name/.git" \ - git log --pretty=oneline --first-parent $range | wc -l + git rev-list --first-parent $range -- | wc -l ) total_commits=" ($(($total_commits + 0)))" ;; |