ff but not that function whereas 86ff53a7a178 includes everything
from the RHS side of the conflict marker (thus including/adding
clone_test).
Keith
Thus spake Ruud Huynen, at Fri, Dec 05, 2014 at 09:04:28PM +0100:
> From: Ruud Huynen
> To: git@vger.kernel.org
> Subject: GIT: cherry-picki
I noticed when cherry-picking a commit it includes changes from this commit
and also changes from a different commit as the one I was picking.
I was in contact with "jast" on IRC, who noticed the issue, but didn't had
time to look further.
For a description of my problem, please read
http://stack
2 matches
Mail list logo
