[LLVMdev] git Status

[David A. Greene]

Matthieu Moy <Matthieu.Moy at grenoble-inp.fr> writes:

> greened at obbligato.org (David A. Greene) writes:
>
>> Actually git pull can sometimes get you into trouble.  Probably git
>> fetch / git rebase is the better combination for LLVM.
>
> I don't get it.
>
> Doesn't "git pull --rebase" do exactly a fetch followed by a rebase?

No.  It does a fetch and merge at the same time.  git fetch lets you
examine what will change before you actually merge/rebase.  Then if you
get too many conflicts it is easy to back out via git revert and
friends.

It's a small distinction, but an important one.

                              -Dave