I made a commit into a branch of a --local clone of my fgdata repository. I
pushed that to the matching branch in my main fgdata.git repository.
Then I attempted to merge one commit into the master branch ... however it
merged *all* my changes.
How can I back this out (I've made some hacks to some f-14b nasal files
which are intended for personal expermentation and break standard behavior.)
How can I cherry pick one particular commit to merge into the master branch?
Thanks,
Curt.
--
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org -
http://www.flightgear.org/blogs/category/curt/<http://www.flightgear.org/blogs/category/personal/curt/>
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Flightgear-devel mailing list
Flightgear-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
