From: Michael Witten Date: Thu, 28 Jan 2010 23:01:34 GMT Subject: Re: Questions about branches in git Message-ID: In-Reply-To: <69b754db1001281456k7c275550r5ffde67b254b510e@mail.gmail.com> On Thu, Jan 28, 2010 at 4:56 PM, Mike Linck wrote: > Your example will work on non-FF branches if you make the second > merge-base use master~1 (else it just gives you the same commit sha > twice) That's the point of the '^' character that I used in my example; it wasn't a mistake.