fix syntax typos in merge_release.sh Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/09034b63 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/09034b63 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/09034b63
Branch: refs/heads/master Commit: 09034b637b7be5f8d0c7df6478c5ad90142dcfcd Parents: af32e87 Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Mon Mar 20 10:40:17 2017 -0400 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Mon Mar 20 10:40:17 2017 -0400 ---------------------------------------------------------------------- buildTools/merge_release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/09034b63/buildTools/merge_release.sh ---------------------------------------------------------------------- diff --git a/buildTools/merge_release.sh b/buildTools/merge_release.sh index ed340ab..bd1269c 100755 --- a/buildTools/merge_release.sh +++ b/buildTools/merge_release.sh @@ -50,12 +50,12 @@ echo echo "If you proceed to merge and there are conflicts you will need to" echo "fix the conflicts and then commit the merge and push:" echo " git status # see the conflicts" -echo " ... fix the conflicts +echo " ... fix the conflicts" echo " git commit -m \"merged ${RELEASE_BRANCH}\"" echo " git push origin master" echo "If you choose not to proceed you may run this script again later." -confirm "Proceed to (no-commit) merge branch ${RELEASE_BRANCH} to master?" || exit +confirm "Proceed to --no-commit merge branch ${RELEASE_BRANCH} to master?" || exit (set -x; git merge --no-commit --no-ff ${RELEASE_BRANCH}) echo