Re: [Flightgear-devel] [Flightgear-commitlogs] FlightGear Base Package branch, master, updated. 79e3dccf888d19a5cfa8372a5b6b592c0505f06d

[Frederic B. <fre...@fr...>]

Hi Vivian,

----- Mail original -----
> De: "Flightgear-commitlogs" <ma...@hy...>
> À: fli...@li...
> Envoyé: Lundi 6 Août 2012 12:14:14
> Objet: [Flightgear-commitlogs] FlightGear Base Package branch, master,        updated.
> 79e3dccf888d19a5cfa8372a5b6b592c0505f06d
>
> The branch, master has been updated
>
> - Log
> -----------------------------------------------------------------
> commit 79e3dccf888d19a5cfa8372a5b6b592c0505f06d
> Merge: e610e85 ca39a67
> Author: Vivian Meazza
> Date:   Mon Aug 6 10:28:22 2012 +0100
>
>     Merge branch 'master' of gitorious.org:fg/fgdata into work
>


You could avoid this long commit log (and salvage the commit tree as James once explained) if you'd do :

git rebase origin/master

after pulling and before pushing. You may need to do

git stash // before rebase followed by

git stash pop // after rebase

if you have uncommitted local mods in your tree

Regards,
-Fred