Moved code detection with `git apply` a la `git blame -C -C`

Anish Tondwalkar· Aug 18, 2015, 20:11 UTC · lore

I stashed some changes, then refactored my code to move the function they're in into a new file. Now, I want to apply it to the new file. I know git can figure out this relationship between the files, because `git blame -C -C` can find it, but is there a "more idiomatic" way to apply this diff than to have git spit out a diff, and edit it manually?

-- 
Anish

Jacob Keller· Aug 19, 2015, 06:42 UTC · re: Anish Tondwalkar · lore

Re: Moved code detection with `git apply` a la `git blame -C -C`

Maybe something along the lines of a git-subtree merge. I am not sure how to do that exactly, and I am not sure that it would be worth the trouble to setup for a small case...

On Tue, Aug 18, 2015 at 1:11 PM, Anish Tondwalkar <tondwalkar@virginia.edu> wrote:

Show 13 quoted lines

> I stashed some changes, then refactored my code to move the function
> they're in into a new file. Now, I want to apply it to the new file. I
> know git can figure out this relationship between the files, because
> `git blame -C -C` can find it, but is there a "more idiomatic" way to
> apply this diff than to have git spit out a diff, and edit it
> manually?
>
> --
> Anish
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html