CODEWITHSUNDEEP
git
lobati
lobati

Reputation: 10235

Git making merge commits when pulling

When moving to version 1.8.3.2 of git I'm encountering an unexpected issue. Every time I pull it makes a new merge commit. Previously when I did a pull I think it did a rebase, but at any rate it didn't make a commit for just the pull. How do I get this behavior back? My configuration hasn't changed. Not sure if it's relevant, but I have branch.autosetuprebase=always.

Upvotes: 0

Views: 479

Answers (2)

lobati
lobati

Reputation: 10235

Figured it out. The repo was copied over to a new installation with its existing git configuration, and the branches were set up without rebase = true, but the old machine had git config --global pull.rebase true, so it didn't make merge commits. Either adding rebase = true to all of the existing branches should do the trick, or what we did was setting pulls to rebase as well.

Upvotes: 4

yurisich
yurisich

Reputation: 7119

Either create a .gitconfig alias entry for git pull, or set it to always do this for you automatically: http://stevenharman.net/git-pull-with-automatic-rebase.

Upvotes: -1

Related Questions