OK, found the answer myself. Adding .patch (or .diff) to the commit-URL will give a nice patch: https://github.com/foo/bar/commit/${SHA}.patch Thanks to Ten Things You Didn’t Know Git And GitHub Could Do…
In git, you can merge without committing. Merge your patch first, then do: git diff –word-diff-regex=. Note the dot after the equals sign.
I’d recommend doing this on a throwaway branch as follows. If your commits are in the “newlines” branch and you have switched back to your “master” branch already, this should do the trick: [adam@mbp2600 example (master)]$ git checkout -b tmpsquash Switched to a new branch “tmpsquash” [adam@mbp2600 example (tmpsquash)]$ git merge –squash newlines Updating 4d2de39..b6768b2 … Read more
Both the input and output are different: git apply takes a patch (e.g. the output of git diff) and applies it to the working directory (or index, if –index or –cached is used). git am takes a mailbox of commits formatted as an email messages (e.g. the output of git format-patch) and applies them to … Read more
In general, git format-patch -n HEAD^ (check help for the many options), although it’s really for mailing them. For a single commit just git show HEAD > some-patch0001.patch will give you a useable patch.
HTTP verbs are probably one of the most cryptic things about the HTTP protocol. They exist, and there are many of them, but why do they exist? Rails seems to want to support many verbs and add some verbs that aren’t supported by web browsers natively. Here’s an exhaustive list of http verbs: http://annevankesteren.nl/2007/10/http-methods There … Read more
If you’re using git add -p and even after splitting with s, you don’t have a small enough change, you can use e to edit the patch directly. This can be a little confusing, but if you carefully follow the instructions in the editor window that will be opened up after pressing e then you’ll … Read more
You can just use git diff to produce a unified diff suitable for git apply: git diff tag1..tag2 > mypatch.patch You can then apply the resulting patch with: git apply mypatch.patch
git diff > patchfile and patch -p1 < patchfile work but as many people noticed in comments and other answers patch does not understand adds, deletes and renames. There is no option but git apply patchfile if you need handle file adds, deletes and renames. EDIT December 2015 Latest versions of patch command (2.7, released … Read more
Note: You can first preview what your patch will do: First the stats: git apply –stat a_file.patch Then a dry run to detect errors: git apply –check a_file.patch Finally, you can use git am to apply your patch as a commit. This also allows you to sign off an applied patch. This can be useful … Read more