From e6462b9089cbcd95b0c57d226fc16f49cd3ef3fc Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Mon, 28 Jul 2014 17:26:36 -0700 Subject: [PATCH] Use git ci for duet commits Signed-off-by: Rob Gallagher --- scripts/deploy-and-finish-release.sh | 4 ++-- scripts/start-release.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/deploy-and-finish-release.sh b/scripts/deploy-and-finish-release.sh index a8f4c59596b..ededf08f506 100755 --- a/scripts/deploy-and-finish-release.sh +++ b/scripts/deploy-and-finish-release.sh @@ -17,11 +17,11 @@ git checkout master && git pull git merge releases/$1 --no-ff -m "Merge branch 'releases/$1'" git tag -a $1 -m "$1 release of the UAA" git push origin master --tags -git co develop && git pull +git checkout develop && git pull git merge releases/$1 --no-ff -m "Merge branch 'releases/$1' into develop" git branch -d releases/$1 ./scripts/set-version.sh $2 -git commit -am "Bump next developer version" +git ci -am "Bump next developer version" set +x diff --git a/scripts/start-release.sh b/scripts/start-release.sh index ff0137059e4..de6e6c1d398 100755 --- a/scripts/start-release.sh +++ b/scripts/start-release.sh @@ -14,7 +14,7 @@ set -x git checkout develop git checkout -b releases/$1 ./scripts/set-version.sh $1 -git commit -am "Bump release version to $1" +git ci -am "Bump release version to $1" git push --set-upstream origin releases/$1 set +x