Git Rebase And Merge Difference