Custom git-flow(always use --no-ff)
Merge pull request #13 from FGtatsuro/custom_git_flow

Custom git-flow(always use --no-ff)