<div dir="ltr">It works for me as well (took one Michael's change from gerrit as an example). You should probably set<div><br><div> git config diff.renamelimit 5000</div><div><br></div><div>or to a similar high number.</div>
<div><br></div><div>Teemu<div class="gmail_extra"><br><div class="gmail_quote">On Tue, Nov 26, 2013 at 12:06 PM, Mark Abraham <span dir="ltr"><<a href="mailto:mark.j.abraham@gmail.com" target="_blank">mark.j.abraham@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><p dir="ltr">Works fine for me. Make sure git is a recent version, and that both branches are present in the repo. Git needs the full history in order to observe the move.</p>
<span class="HOEnZb"><font color="#888888">
<p dir="ltr">Mark</p></font></span><div class="HOEnZb"><div class="h5">
<div class="gmail_quote">On Nov 26, 2013 9:06 AM, "Berk Hess" <<a href="mailto:hess@kth.se" target="_blank">hess@kth.se</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi,<br>
<br>
I have a commit on top of release-4-6 and want to also have it on top of master. Doing git cherry-pick results in conflicts for all files, since all files have been moved.<br>
Is there a way to port the commit and have git resolve the file movement automatically?<br>
<br>
Cheers,<br>
<br>
Berk<br></blockquote></div></div></div></blockquote></div></div></div></div></div>