Fred > -----Original Message----- > From: eric Bouvier [mailto:fredfgf...@free.fr] > Sent: 06 August 2012 11:23 > To: FlightGear developers discussions > Subject: Re: [Flightgear-devel] [Flightgear-commitlogs] FlightGear Base > Package branch, master, updated. > 79e3dccf888d19a5cfa8372a5b6b592c0505f06d > > Hi Vivian, > > ----- Mail original ----- > > De: "Flightgear-commitlogs" <mar...@hypersphere.calit2.net> > > À: flightgear-commitl...@lists.sourceforge.net > > 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 >
I pulled, and did a rebase before pushing, but my stuff came halfway through yours chronologically, and seemed to have got tangled up with yours. At least, TortoiseGit seemed not to be able to do it any other way. At least it's trying to rebase nowadays. And if I had any uncommitted changes, I would have stashed, but I never have any in my master clone. Btw - what is the practical application of all that clever stuff? Any chance of a review of FGRun to include some of the new items? Vivian ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
