1. rebase @ymmt2005

2. rebase rebase push 3. rebase merge $ git fetch origin $ git merge --no-ff origin/master rebase git rerere 4. rebase git git log --first-parent --no-merges git log --graph --pretty=%x09%h %cn%x09%s %d Subversion 5. rebase squash merge $ (DEV) $ git fetch origin $ git checkout -b TOPIC origin/master $ git merge --squash DEV $ git commit squash rebase 6. merge --no-ff fast-forward --no-ff $ git config --global merge.ff false