The file called .gitignore can be used similar (or better) to svn:ignore to ignore certain files (e.g. compiled object files, the binary file itself, .mo files are all good candidates) that are being rebuild or should never be committed (by accident).
My changes can be found here:
https://git.mxchange.org/?p=quix0rs-blobwars.git;a=commit;h=fdaa30c197c0f3ce5fad418bfd9bbd78cad2e32f
You should remote-track mine to maintain git history (or else your name is used as committer name) to prevent "commit-stealing":
$ git remote add quix0r git://git.mxchange.org/quix0rs-blobwars.git --track master
Then you can easily merge it:
$ git merge quix0r/master -S
The -S is for signing. :-)
If you don't want to merge, then cherry-pick is also possible (without loosing history):
$ git cherry-pick -S fdaa30c197c0f3ce5fad418bfd9bbd78cad2e32f
Best regards,
Roland
And before I forget it, I have also fixed access rights as executable is not needed on those files.