summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-11-18 15:11:07 +0100
committerJan Holesovsky <kendy@collabora.com>2014-11-18 15:11:07 +0100
commitaf20dd7b50a8bd48972aaf380a26169d85a02022 (patch)
treef24d6c71d661a5690e700e86671fa54cfdc0b48c /bin
parent4cbe6f95e00d7a8b796b019a97d06e3b3ad52b47 (diff)
check-merged.sh: Fix an obvious typo.
Change-Id: I4761c730df5f418060697458b604c602713f4a0e
Diffstat (limited to 'bin')
-rwxr-xr-xbin/check-merged.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/check-merged.sh b/bin/check-merged.sh
index f4e78132098d..678afe84d6de 100755
--- a/bin/check-merged.sh
+++ b/bin/check-merged.sh
@@ -19,7 +19,7 @@ EOF
}
function collect_change_ids {
- git log `git merge-base origin/master origin/feature/opengl-vcl`.."$1" | \
+ git log `git merge-base origin/master "$1"`.."$1" | \
sed 's/^commit /XXXcommitXXX/g' | \
tr '\n' ';' | \
sed 's/XXXcommitXXX/\n/g' | \