On 2016-03-16 08:04-0000 Arjen Markus wrote: > By the way, your most recent commits did not show up in the log. But when I did "git merge -ff-only origin/master" I did get the changes. Very odd.
Probably not that odd. "git log" generates the log _for the current branch_. So if you had checked out master branch, and invoked "git log" it would not show the recent commits downloaded to origin/master by "git fetch". In other words origin/master and master are two quite distinct branches; the first is populated by "git fetch", the second by fast forwarding (at least with our workflow) from some other local branch (such as origin/master or some topic branch) to master. That is why master has no merge commits and therefore a very clean-looking history. Which allows you to "git push origin master" from that branch (which fast forwards to both origin/master and the master branch at SF) and propagate that linear history. 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 __________________________ ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785231&iu=/4140 _______________________________________________ Plplot-devel mailing list Plplot-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/plplot-devel
