Skip to content

Commit

Permalink
Use git ci for duet commits
Browse files Browse the repository at this point in the history
Signed-off-by: Rob Gallagher <rgallagher@pivotallabs.com>
  • Loading branch information
mbhave authored and Rob Gallagher committed Jul 29, 2014
1 parent 4ac5808 commit e6462b9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions scripts/deploy-and-finish-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/start-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e6462b9

Please sign in to comment.