mergeしたいけど、怖いのでdryrunしたいとき

gistfile1.md

As noted previously, pass in the --no-commit flag, but to avoid a fast-forward commit, also pass in --no-ff, like so:

$ git merge --no-commit --no-ff $BRANCH

This will allow you to examine/undo the merge, even if it is a fast-forward merge.

これで問題なければ後はcommitすればOK.

refs.[http://stackoverflow.com/questions/501407/is-there-a-git-merge-dry-run-option]