From git help format-patch DISCUSSION The patch produced by git format-patch is in UNIX mailbox format, with a fixed “magic” time stamp to indicate that the file is output from format-patch rather than a real mailbox, like so: From 8f72bad1baf19a53459661343e21d6491c3908d3 Mon Sep 17 00:00:00 2001 From: Tony Luck <tony.luck@intel.com> Date: Tue, 13 Jul 2010 11:42:54 … Read more
You can do the following: git am /path/to/some.patch patch -p1 < /path/to/some.patch git add . git am –continue That would apply the patch and keep the commit message, etc.
I always have to Google this but the way I’ve found that works perfectly (for me) is: Create the patch with git diff –no-prefix master..branch > somefile.diff, the master and branch part are optional, depends how you want to get your diffs. Send it wherever and apply with patch -p0 < somefile.diff. It always seems … Read more
Try: git format-patch -1 <sha> or git format-patch -1 HEAD According to the documentation link above, the -1 flag tells Git how many commits should be included in the patch; -<n> Prepare patches from the topmost commits. Apply the patch with the command: git am < file.patch