Skip to content

Instantly share code, notes, and snippets.

@mikesorae

mikesorae/gist:ec8db8fa37e361a1f64e

Created August 11, 2015 08:16
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mikesorae/ec8db8fa37e361a1f64e to your computer and use it in GitHub Desktop.
Save mikesorae/ec8db8fa37e361a1f64e to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
# merge into BASE
git checkout "$DEVELOP_BRANCH"
if [ "$(git rev-list -n2 "$DEVELOP_BRANCH..$BRANCH" | wc -l)" -eq 1 ]; then
git merge --ff "$BRANCH"
else
git merge --no-ff "$BRANCH"
fi
@mikesorae
Copy link
Author

git flowでffしてるとこ

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment