* Moved code detection with `git apply` a la `git blame -C -C`
@ 2015-08-18 20:11 Anish Tondwalkar
2015-08-19 6:42 ` Jacob Keller
0 siblings, 1 reply; 2+ messages in thread
From: Anish Tondwalkar @ 2015-08-18 20:11 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Moved code detection with `git apply` a la `git blame -C -C`
2015-08-18 20:11 Moved code detection with `git apply` a la `git blame -C -C` Anish Tondwalkar
@ 2015-08-19 6:42 ` Jacob Keller
0 siblings, 0 replies; 2+ messages in thread
From: Jacob Keller @ 2015-08-19 6:42 UTC (permalink / raw)
To: Anish Tondwalkar; +Cc: Git List
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:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-19 6:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-18 20:11 Moved code detection with `git apply` a la `git blame -C -C` Anish Tondwalkar
2015-08-19 6:42 ` Jacob Keller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).