Re: [Flightgear-devel] Git advice

2009-01-08 Thread Tim Moore
John Denker wrote: On 01/07/2009 01:19 PM, James Turner wrote: On 7 Jan 2009, at 19:05, Tim Moore wrote: I like to fetch and then rebase my local work without merging; it makes it much easier to get the commits into CVS via git-cvsexportcommit. When we move to git and publish

Re: [Flightgear-devel] Git advice

2009-01-07 Thread Tim Moore
James Turner wrote: 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

Re: [Flightgear-devel] Git advice

2009-01-07 Thread James Turner
On 7 Jan 2009, at 19:05, Tim Moore wrote: I like to fetch and then rebase my local work without merging; it makes it much easier to get the commits into CVS via git-cvsexportcommit. When we move to git and publish (sometimes) personal branches, I'll probably switch back to git-pull.

Re: [Flightgear-devel] Git advice

2009-01-07 Thread John Denker
On 01/07/2009 01:19 PM, James Turner wrote: On 7 Jan 2009, at 19:05, Tim Moore wrote: I like to fetch and then rebase my local work without merging; it makes it much easier to get the commits into CVS via git-cvsexportcommit. When we move to git and publish (sometimes) personal

Re: [Flightgear-devel] Git advice

2009-01-05 Thread Thomas Förster
Am Montag 05 Januar 2009 schrieb James Turner: - 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

Re: [Flightgear-devel] Git advice

2009-01-05 Thread James Turner
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

[Flightgear-devel] Git advice (was Re: Refresh of the GIT mirror on 'mapserver.flightgear.org')

2008-12-27 Thread James Turner
On 26 Dec 2008, at 16:37, Timothy Moore wrote: I recommend that you use git-cvsimport -k. It can be a bit time- consuming, but I've never had the kind of inconsistencies that I would see with taylor, and it knows how to do deletes! I could benefit from some advice on using git to track

Re: [Flightgear-devel] Git advice (was Re: Refresh of the GIT mirror on 'mapserver.flightgear.org')

2008-12-27 Thread Tim Moore
James Turner wrote: I could benefit from some advice on using git to track (various) local changes I'm working on. 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