Git Merge Rebase Fast Forward