Git branch, 병합(merge, rebase), commit 수정