$ git checkout -b branch-for-merge
$ git merge --squash topic-branch
$ git checkout master
$ git merge --no-ff branch-for-merge
$ git push origin master
$ git branch -d branch-for-merge
$ git branch -d topic-branch
Created
December 28, 2013 11:25
-
-
Save devlights/8158436 to your computer and use it in GitHub Desktop.
gitでno-ffでマージしながらコミットはひとまとめ(squash)にしてマージする方法
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
http://najeira.blogspot.jp/2013/04/git-2.html