undefined | Better HN

0 pointspetepete2y ago0 comments

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

    [pull]
      rebase = true

0 comments

2 comments · 1 top-level

kazinator2y ago· 1 in thread

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.

mabster2y ago

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.

j / k navigate · click thread line to collapse