Hacker News Reader

Comment by nwellnhof | Hacker News Reader

Isn't that what "git pull --rebase" does?

I've had it enabled by default for years and years. It's always what I want.

    [pull]
      rebase = true

I did that for several months in 2010. It's too error prone; you will forget to have that configured somewhere and get a merge by mistake.

So then I trained myself on "pull --rebase". I soon realized, I don't want to be combining fetch and rebase. The best way was to just scrub the pull command from the vocabulary.

It's fine nowadays but there was a time when "git pull --rebase" worked slightly differently to "git fetch" and "git rebase". I'd get conflicts with the former that I didn't get with the latter.

I don't rebase immediately after a git fetch. I look at what is new first. I might not rebase over all of it. E.g. the first three commits may have something I need to pick up, but then after that there may be something I don't want to integrate with yet.

Reply on news.ycombinator.com