Git diff to patch

The file's location is different in each repository. Main repo: www. For bonus points, what if the file you want to apply the patch to isn't in a git repository? Improve this question. CharlesB James Wheare James Wheare 4, 1 1 gold badge 23 23 silver badges 22 22 bronze badges. Add a comment. Active Oldest Votes. Improve this answer. Any chance making this top answer? This is far easier than manually editing a patch file.

Relevant to adjusting the directory after first trying without --directory : stackoverflow. Ioannis Filippidis 8, 9 9 gold badges 70 70 silver badges bronze badges. Revisiting this page later… This is a better answer to the question asked than the previous "winner" that suggested submodules. Henrik Paul Henrik Paul 65k 30 30 gold badges 83 83 silver badges 96 96 bronze badges. Hmm, having read through the submodule docs, this doesn't sound like "an easy way" though it may well be the most robust.

It looks like I'd have to create a submodule containing just the playdar. Or continue to copy paste between the two. Here's a clear and thorough tutorial and getting started with git submodule for anyone else stumbling upon this question: book. To complete Henrik's answer , and to go for the bonus point what if the file you want to apply the patch to isn't in a git repository?

Community Bot 1 1 1 silver badge. VonC VonC 1. Improve this question. Mark Canlas. Mark Canlas Mark Canlas 9, 5 5 gold badges 40 40 silver badges 61 61 bronze badges. Did you try a diff on the diffs? Gnu diff has a command line switch for specifying regex for lines to be ignored when generating the diff. Diff of diffs is the way to go when you need certain answer — max Add a comment. Active Oldest Votes.

Improve this answer. Can you add some context as to how this answers the question? It compares diffs two diffs in this case the diffs of two different commits. It makes a diff of the actual changes that the commits made, as well as the metadata of the commits sha, author, date, commit message etc.

I have used this to check if two commits in separate branches introduce the same change, to be certain that I can use either of them for a cherry-pick. See tldp. I've used this approach in the past and found it pretty weak. However, today I was inspired to add the --ignore-matching-lines option to skip useless hunks where the diff is only showing differences in line numbers which are an unavoidable distraction when comparing to otherwise very similar commits.

Show 1 more comment. G' This should work even for more than one patch in each range. Should this be git range-diff E.. I'll correct my answer. What does single quotation marks mean here E'.. Lajos The same as in the original question: E' is a variant of E e.

So it's just a name for a revision that you have to adapt when working on an actual repository. For the benefit of the reader, here is an update to the answer of mrbrdo with a little tweak: Adds git sdiff alias for easy access of this. Allow diff options to be used like -u etc. Run this once in each of your accounts in which you use git : git config --global alias. Explained: git config --global alias. Bugs: Number of arguments is not checked. It does not return an error if something breaks.

Any diff-generating command can take the -c or --cc option to produce a combined diff when showing a merge. This is the default format when showing merges with git-diff[1] or git-show[1].

Note also that you can give suitable --diff-merges option to any of these commands to force generation of diffs in specific format. It is preceded with a "git diff" header, that looks like this when the -c option is used :. It is followed by one or more extended header lines this example shows a merge with two parents :. This extended format can be useful if rename or copy detection is active, to allow you to see the original name of the file in different parents.

Chunk header format is modified to prevent people from accidentally feeding it to patch -p1. Combined diff format was created for review of merge commit changes, and was not meant to be applied.

The change is similar to the change in the extended index header:. A - character in the column N means that the line appears in fileN but it does not appear in the result.