diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2016-06-01 14:16:00 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2016-06-01 14:16:00 +0000 |
| commit | 645eab26ad7929abe56a995568bb06aa30f96e84 (patch) | |
| tree | a1170d48b44a1b39766f253ab66d807671704da6 /utils/release | |
| parent | 90828513f40de2feec2fcdc7943ec8683e2b739d (diff) | |
Update usage(), make sure srcdir is really empty.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@271396 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/release')
| -rwxr-xr-x | utils/release/merge.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/utils/release/merge.sh b/utils/release/merge.sh index 01d807920e4..b4893224834 100755 --- a/utils/release/merge.sh +++ b/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 |