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 >> 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? > As Thomas mentioned, "git fetch" only updates your local copy of the remote branches; "git pull" does that and then merges the remote branch with your local. 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".
> - 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? Linus doesn't like whitespace at the end of lines or whitespace before a tab at the beginning of a line. Git can be configured to reject changes that introduce bogus whitespace, but by default just warns you. Tim ------------------------------------------------------------------------------ Check out the new SourceForge.net Marketplace. It is the best place to buy or sell services for just about anything Open Source. http://p.sf.net/sfu/Xq1LFB _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
