<div dir="ltr">I also have set<div><br></div><div>git config --global diff.renames copies</div><div><br></div><div>which might do the trick. See <a href="http://nuclearsquid.com/writings/git-tricks-tips-workflows/" style="font-family:arial;font-size:small">http://nuclearsquid.com/writings/git-tricks-tips-workflows/</a></div>
<div><br></div><div>Mark</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Nov 26, 2013 at 11:06 AM, 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>
<br>
-- <br>
Gromacs Developers mailing list<br>
<br>
* Please search the archive at <a href="http://www.gromacs.org/Support/Mailing_Lists/GMX-developers_List" target="_blank">http://www.gromacs.org/<u></u>Support/Mailing_Lists/GMX-<u></u>developers_List</a> before posting!<br>
<br>
* Can't post? Read <a href="http://www.gromacs.org/Support/Mailing_Lists" target="_blank">http://www.gromacs.org/<u></u>Support/Mailing_Lists</a><br>
<br>
* For (un)subscribe requests visit<br>
<a href="https://maillist.sys.kth.se/mailman/listinfo/gromacs.org_gmx-developers" target="_blank">https://maillist.sys.kth.se/<u></u>mailman/listinfo/gromacs.org_<u></u>gmx-developers</a> or send a mail to <a href="mailto:gmx-developers-request@gromacs.org" target="_blank">gmx-developers-request@<u></u>gromacs.org</a>.<br>
</blockquote></div>
</div></div></blockquote></div><br></div>