How to apply .diff file?

[Lord Ganja]

I need help in applying a .diff file..

 

I somehow messed up my trunk files so I decided to re-download the latest rathena GIT (Since the one I messed up was also the latest GIT).

Before my files are messed up, I saved my all of my modifications using the 'Save unified diff' and created a .diff file.. Now, I was wondering on how could I apply this diff to my fresh rAthena trunk without applying them manually since it would take too much time..

 

I tried doing this: BTW im using Windows 7 OS

1) I put my .diff file inside my rathena folder. Then right click the diff file > TortoiseGIT > Apply Patch Serial

This is the result:

git.exe am --3way --ignore-space-change --keep-cr "C:\Users\LordGanja\Desktop\rAthena\mods.diff"
Patch does not have a valid e-mail address.

Fail

2) Because it failed, I put my email address on the TortoiseGIT settings under User Info (Config Source: Global),

then I tried to patch it again, I got the same error.

 

For all who can help, Thanks in advance! 

[Winz]

Git created patches are meant to be applied with Git tools. Use

git apply <patch>

If the patch is not created with Git, then just use a patch program 'behind the back' of Git. Often this is the program 'patch':

patch <patch>

After applying the patch, add and commit in Git as usual.

Edited August 29, 2015 by Winz