Can I get a patch-compatible output from git-diff?

Question

I am doing something very simple wrong. I\'m trying to prepare an ordinary patch file, so I can reapply some changes:

$ git diff > before
$ git diff some         


        

Answer 1

Just use -p1: you will need to use -p0 in the --no-prefix case anyway, so you can just leave out the --no-prefix and use -p1:

$ git diff > save.patch
$ patch -p1 < save.patch

$ git diff --no-prefix > save.patch
$ patch -p0 < save.patch