On 2015-05-25 09:33-0700 Alan W. Irwin wrote: > Or > you also have the option of rebasing so you end up effectively with > > master: ... A-B-C-R-S-T-U-V-W-X-Y-Z > \ > f95update: G-H-I > > where I have used different letters for the 3 extra commits to show > that the rebase has changed those commits (since each commit refers to > a complete file system snapshot) from what they were before. But in > this case > > git checkout f95update > git format-patch G^ > > would give you the same patch file (except for the commit identity > associated with each of the 3 commits) that you produced before.
Oops. I should have added the same patch file would be produced assuming the rebase process is a clean one (i.e., there are no conflicts to resolve between your changes and the additional changes done by rebasing on master). Alan __________________________ Alan W. Irwin Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the FreeEOS equation-of-state implementation for stellar interiors (freeeos.sf.net); the Time Ephemerides project (timeephem.sf.net); PLplot scientific plotting software package (plplot.sf.net); the libLASi project (unifont.org/lasi); the Loads of Linux Links project (loll.sf.net); and the Linux Brochure Project (lbproject.sf.net). __________________________ Linux-powered Science __________________________ ------------------------------------------------------------------------------ One dashboard for servers and applications across Physical-Virtual-Cloud Widest out-of-the-box monitoring support with 50+ applications Performance metrics, stats and reports that give you Actionable Insights Deep dive visibility with transaction tracing using APM Insight. http://ad.doubleclick.net/ddm/clk/290420510;117567292;y _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
