Re: Recording the date at which a change was pushed to Savannah

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Cc: address@hidden,  address@hidden
> Date: Wed, 03 Dec 2014 14:34:13 -0500
> 
> >> > You can see the "mainline" in Git with "log --graph" or in Emacs with
> >> > "C-x v L".
> >> No, that's *a* mainline.  It won't always agree with your idea of what
> >> is *the* mainline.
> > In what way and under which circumstances might that happen?
> 
> IIRC when you do:
> 
>     git commit
>     git pull
>     <merge&commit>
>     git push
> 
> The merge commit will put what was previously "the mainline" in the
> "second" position, while your "git commit" will now appear as being on
> "the mainline".

That's why we recommend "git pull --rebase" in this case (and I
actually pull.rebase = preserve in my .gitconfig).

But in any case, no matter how the mainline became one, it is still
_the_ mainline, right?