summaryrefslogtreecommitdiff
path: root/git-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-09 05:36:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-09 05:36:14 (GMT)
commit72d9b222a940c93a8d915c26a4d5d077e23be871 (patch)
treeb1bfaf4991ee3edf1410ef4e5dff3a5475746795 /git-submodule.sh
parente251a7b34a85b0ac8a63a31e899e070ea2a330c7 (diff)
parent4f62c2bc577bbb85b65f3261c7fab7ef74def4cd (diff)
downloadgit-72d9b222a940c93a8d915c26a4d5d077e23be871.zip
git-72d9b222a940c93a8d915c26a4d5d077e23be871.tar.gz
git-72d9b222a940c93a8d915c26a4d5d077e23be871.tar.bz2
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-xgit-submodule.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh
index 3319b83..8175cb2 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)))"
;;