On 27 Dec 2008, at 15:04, Tim Moore wrote: > Here's my workflow for using git with the FlightGear sources in CVS. > Note that > there are separate repositories for Fightgear, Simgear and the > Flightgear data. > This is inconvenient and there may a workaround using git > submodules, but I > haven't explored that yet.
Finally got around to following this advice, thanks Tim. Two questions: (for anyone who knows git, not just Tim) - when I want to sync the main repo with the cvs-import one, your instructions say 'git fetch', but I seem to need to 'git pull' to get the master branch in sync with the origin. It works fine, I guess I'm just mis-understanding what fetch actually does? - when I rebase my topic branches (having fetch + pull-ed to the master), I'm getting some (10 at the moment of these:) /Users/jmt/Code/Macflightgear/flightgear/FlightGear-git/.git/rebase- apply/patch:31: trailing whitespace. I assume this is innocuous, but I wonder if anyone can explain what I might have done to cause this? Regards, James ------------------------------------------------------------------------------ _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
