<html><head><meta http-equiv="Content-Type" content="text/html charset=windows-1252"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">Hi Kevin,<div><br><div><div>On 07 Feb 2017, at 00:34 , Kevin Reid <<a href="mailto:kpreid@switchb.org">kpreid@switchb.org</a>> wrote:</div><blockquote type="cite"><div dir="ltr"><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><div class="gmail_extra"><div class="gmail_quote"><font face="monospace, monospace">git merge --ff-only <branch></font></div></div></blockquote></div></blockquote><br></div><div>yes, that’s mentioned in</div><div><br></div><div><span class="Apple-tab-span" style="white-space:pre"> </span><a href="https://trac.macports.org/wiki/WorkingWithGit#branch">https://trac.macports.org/wiki/WorkingWithGit#branch</a></div><div><br></div><div>Greets,</div><div>Marko</div><br></div></body></html>