Question

Recently, I did only 1 commit but I don’t know why it shows 3 commits.

Here is what I did recently:

1. Created a new repository on GitHub; initialized it with one README and .gitignore file. (I understand GitHub commited on my behalf and so this is my first lost commit.)
2. • added and commited a file.
   • did a git remote add origin [e-mail]:me/repo.git
   • did git pull origin master to get the changes from the GitHub (README and .gitignore)
   • did git push

My questions are:

1. I haven’t done anything like git merge then why my third commit says “Merge branch ‘master’ of github.com:me/repo”? What is going behind the curtain?
2. I had only expected the first two commits (the one I did and the another which GitHub did when initialization of repo). Where did this 3rd came from? I can I get rid of these type of commits?

Any tips regarding this?

Answer 1

To not have the merge commit when you do a pull, you want to do git pull --rebase origin master. This will move the changes and not cause a merge.

http://gitready.com/advanced/2009/02/11/pull-with-rebase.html