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?
  it's in an early release of an ORA book, "git for teams." it's quite
possible it's just a typo. i took a snapshot of the figure and
attached it, so you can see for yourself.
rday
-- 
========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca
Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================