TouchInstinct
/
checkstyle
303
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor: update for --ff-only and fail-fast

This commit is contained in:
Roman Ivanov 2015-09-03 21:30:38 -04:00
parent 0b4ae9160b
commit f2dacddde9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fast-forward-merge.sh
View File

@ -1,4 +1,5 @@
#!/usr/bin/env bash
set -e
if [ $# -eq 0 ]
then
@ -28,7 +29,7 @@ git rebase master
echo "merge to master ..."
git checkout master
git merge ${LOCAL_USER_BRANCH}
git merge ${LOCAL_USER_BRANCH} --ff-only
echo "removing local branch ..."
git branch -D ${LOCAL_USER_BRANCH}