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 actually does?
Fetch just updates the local remote branch without actually merging. 'pull' is a fetch followed by a merge into the current(?) branch. These two should be equivalent: $> git pull remotebranch $> git fetch remotebranch $> git merge remotebranch Thomas ------------------------------------------------------------------------------ _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel