Posted:
Note: apparently this is solved by:
git config --global alias.up 'pull --rebase'
Thanks goes to wereHamster and others on chat.freenode.irc #git
In this Supreme Court Case, I, Matt Di Pasquale, challenge Git.
I do not think that Git should record a merge commit if the merge completes automatically, w/o conflicts. Understand?
Is there a reason it does this?
Any challenges?
Matt
P.S. To get around this, I git stash; git pull; git stash pop; git commit.
P.P.S. Now, I know it's easier to just do git pull --rebase.