inside the mind of a linux admin

creating a patch file from git

I’m a huge fan of the oldschool “patch” command, and sometimes in the wild I use Gitorious’ “raw diff” view which puts the changes in easy to read patch format. However, you can also do this on the command line to create a patch file that can be applied using “patch -p0 < patchfile".

git diff –no-prefix > patchfile

When you want to apply the patch to your old local copy:

patch -p0 < patchfile

Or, if you have an existing “git diff” patch file that was created without the “–no-prefix” option, you can apply that patch and ignore the default a/ b/ source prefixes with:

patch -p1 < patchfile

Related Posts

synergy: How to enable crypto (encryption) and generate SSL certificate

The newer Linux versions of the popular mouse/keyboard sharing application “synergy” now has built in encryption. Here’s how to configure it: Just simply passing the –enable-crypto flag on your synergy server without having a proper SSL certificate will result in the inability to connect to clients and generate an error message similar to this in […]

Read More

Change Number Pad Delete (dot) key from a comma in Ubuntu Linux

I recently purchased a new keyboard and updated to the latest Ubuntu, I’m also an avid user of the number pad for quick input when dealing with spreadsheets or accounting. I found that my num pad’s delete key (“.”) was outputting a comma (“,”) instead. Pretty annoying? I agree, but this can be very easily […]

Read More

Leave a Reply

Your email address will not be published. Required fields are marked *

This site uses Akismet to reduce spam. Learn how your comment data is processed.

Tweeter button Facebook button Myspace button