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

2015-08-19 Thread Jacob Keller
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
tondwal...@virginia.edu wrote:
 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 majord...@vger.kernel.org
 More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2015-08-18 Thread Anish Tondwalkar
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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html