0

I want to get 5 more changesets from the remote that I subtree'd into a subfolder and "git apply patch" isn't working, possibly because git apply treats the subtreed folder as a submodule? I got the patches via "git-format-patch".

I'm working on Windows, so I don't have access to the Linux "patch" command. I could spin up a VM and try this on Linux, I could also start googling for "git subtree cherry-pick" (if that's a thing) but I'd sooner get apply working. Any clues? Does it just not work?

Nimantha
  • 6,405
  • 6
  • 28
  • 69
timB33
  • 1,977
  • 16
  • 33

1 Answers1

0

I had to do this on Linux via the "patch" command thus:

patch -p1 < foo.patch

Not ideal, but it worked.

timB33
  • 1,977
  • 16
  • 33