Question

So I have enough knowledge of git to get by however I’ve been running into an annoyance when using git. When I try to push my commits to github and I haven’t checked for someone elses push first I have to do a fast forward pull. So I do git pull origin master and then I can go and do my git push origin master this is all fine and dandy but then I get a secondary commit about me merging branch master, how can I do this so that I can pull in new files so i can push again but not get the annoying merge commit message on github?

Answer 1

two variants:

git pull --no-commit – will not create the merge commit

git pull --rebase – will rebase your changes on top of the changes in remote master branch, effectively streamlining the history and avoiding merge commit