Re: Merge after rename

2015-07-09 Thread Jacob Keller
On Thu, Jul 9, 2015 at 1:44 PM, Phil Susi ps...@ubuntu.com wrote: I'm trying to cherry pick an old change from an old branch onto the current master, and since the old change, the directory structure was altered and the modified files were moved. Instead of detecting the new location of the

Merge after rename

2015-07-09 Thread Phil Susi
I'm trying to cherry pick an old change from an old branch onto the current master, and since the old change, the directory structure was altered and the modified files were moved. Instead of detecting the new location of the file and applying the changes to it, git is re-adding the old file