summaryrefslogtreecommitdiffstats
path: root/llvm/utils
diff options
context:
space:
mode:
authorJoerg Sonnenberger <joerg@bec.de>2016-06-01 14:16:00 +0000
committerJoerg Sonnenberger <joerg@bec.de>2016-06-01 14:16:00 +0000
commita13a0e1aeab04b6f23bfcd2b4fad961265dea08e (patch)
tree0417c58a44f6bd8858f252bee19979321d411a6c /llvm/utils
parent1cd61b82bdffbdf762f1b605fb24c51de8f0754d (diff)
downloadbcm5719-llvm-a13a0e1aeab04b6f23bfcd2b4fad961265dea08e.tar.gz
bcm5719-llvm-a13a0e1aeab04b6f23bfcd2b4fad961265dea08e.zip
Update usage(), make sure srcdir is really empty.
llvm-svn: 271396
Diffstat (limited to 'llvm/utils')
-rwxr-xr-xllvm/utils/release/merge.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/llvm/utils/release/merge.sh b/llvm/utils/release/merge.sh
index 01d807920e4..b4893224834 100755
--- a/llvm/utils/release/merge.sh
+++ b/llvm/utils/release/merge.sh
@@ -17,12 +17,14 @@ set -e
rev=""
proj=""
revert="no"
+srcdir=""
usage() {
echo "usage: `basename $0` [OPTIONS]"
echo " -proj PROJECT The project to merge the result into"
echo " -rev NUM The revision to merge into the project"
echo " -revert Revert rather than merge the commit"
+ echo " -srcdir The root of the project checkout"
}
while [ $# -gt 0 ]; do
OpenPOWER on IntegriCloud