On Sun, 26 Apr 2015, Alex Pilon wrote: > On Sun, Apr 26, 2015 at 05:19:00AM -0400, Robert P. J. Day wrote: > > i'm well aware of the standard behaviour of a FF merge in git, but > > i'm looking at a git book > > Published… or are you under an NDA? > > > which shows a figure purporting to show a FF merge and it confuses the > > heck out of me. > > It may be a stupid question… are you sure it's the right figure? Some > typographical software sometimes confusingly pushes figures down, to > ‘make everything fit’ optimally. i attacked a screengrab of just that part of the figure ... it should be enough to see what the figure is trying to say. if there's a way to interpret that in any meaningful way, i'm not aware of it. rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================