Curtis Olson wrote: > I have a local branch I've created here for some experimentation. When > ever I do a git pull from the gitorious repository, I do that in the > "next/master" branches. Then I switch to my local branch and type "git > merge next (or master)" to make my local branch up to date with the main > development "head". > > There may be a better way to do that, but it's what was suggested to me, > and seems to work and I've stuck with it.
For the sake of completeness and (possibly) nicer git history in the future let me say this: There IS indeed a better way for exactly your use-case: When switching back to your local branch after "git pull" in next, use "git rebase next (or master)" on your local branch. This makes sure your changes are always on top of your local branch and prevents those "Merge commit XXX" messages in the git history. HTH Chris ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
