marge前のcommit/push
pull前のcommit
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into Fujiwara