git, merge master and develop previous commit

> git checkout develop
> git checkout [revision] -b [tmp_branch]
> git checkout master
> git merge [tmp_branch]
> git branch -d [tmp_branch]