{"thread":{"id":"40126","subject":"Moved code detection with `git apply` a la `git blame -C -C`","startedAt":"2015-08-18T20:11:09Z","lastAt":"2015-08-19T06:42:13Z","messageCount":2,"participants":["Anish Tondwalkar","Jacob Keller"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"268287","messageId":"CALZPV0Dgmu5fJqQEXwxVvn9Na6jUtvkDbAwY9mAZKeFSMqo8xQ@mail.gmail.com","threadId":"40126","inReplyTo":null,"subject":"Moved code detection with `git apply` a la `git blame -C -C`","fromName":"Anish Tondwalkar","fromEmail":"tondwalkar@virginia.edu","sentAt":"2015-08-18T20:11:09Z","receivedAt":"2015-08-18T20:11:09Z","isPatch":false,"sender":{"key":"tondwalkar@virginia.edu","avatar":null},"body":"I stashed some changes, then refactored my code to move the function\nthey're in into a new file. Now, I want to apply it to the new file. I\nknow git can figure out this relationship between the files, because\n`git blame -C -C` can find it, but is there a \"more idiomatic\" way to\napply this diff than to have git spit out a diff, and edit it\nmanually?\n\n-- \nAnish\n"},{"id":"268290","messageId":"CA+P7+xrbE9TxzXWwixOv12r0wb=Y17BRxyKFHGTUb0-4Q+wyhA@mail.gmail.com","threadId":"40126","inReplyTo":"CALZPV0Dgmu5fJqQEXwxVvn9Na6jUtvkDbAwY9mAZKeFSMqo8xQ@mail.gmail.com","subject":"Re: Moved code detection with `git apply` a la `git blame -C -C`","fromName":"Jacob Keller","fromEmail":"jacob.keller@gmail.com","sentAt":"2015-08-19T06:42:13Z","receivedAt":"2015-08-19T06:42:13Z","isPatch":false,"sender":{"key":"jacob.keller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/874719?v=4"},"body":"Maybe something along the lines of a git-subtree merge. I am not sure\nhow to do that exactly, and I am not sure that it would be worth the\ntrouble to setup for a small case...\n\nOn Tue, Aug 18, 2015 at 1:11 PM, Anish Tondwalkar\n<tondwalkar@virginia.edu> wrote:\n> I stashed some changes, then refactored my code to move the function\n> they're in into a new file. Now, I want to apply it to the new file. I\n> know git can figure out this relationship between the files, because\n> `git blame -C -C` can find it, but is there a \"more idiomatic\" way to\n> apply this diff than to have git spit out a diff, and edit it\n> manually?\n>\n> --\n> Anish\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at  http://vger.kernel.org/majordomo-info.html\n"}]}