summaryrefslogtreecommitdiff
path: root/scripts/contrithanks.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/contrithanks.sh')
-rwxr-xr-xscripts/contrithanks.sh15
1 files changed, 14 insertions, 1 deletions
diff --git a/scripts/contrithanks.sh b/scripts/contrithanks.sh
index da395aebf..44e461455 100755
--- a/scripts/contrithanks.sh
+++ b/scripts/contrithanks.sh
@@ -36,10 +36,23 @@ if test -z "$start"; then
start=`git tag --sort=taggerdate | tail -1`;
fi
+
+# We also include curl-www if possible. Override by setting CURLWWW
+if [ -z "$CURLWWW" ] ; then
+ CURLWWW=../curl-www
+fi
+
cat ./docs/THANKS
(
-git log --use-mailmap $start..HEAD | \
+ (
+ git log --use-mailmap $start..HEAD
+ if [ -d "$CURLWWW" ]
+ then
+ git -C ../curl-www log --use-mailmap $start..HEAD
+ fi
+ ) | \
+
egrep -ai '(^Author|^Commit|by):' | \
cut -d: -f2- | \
cut '-d(' -f1 | \