Create patch or diff file from git repository and apply it to another different git repository

git diff patch git-diff git-apply
zatamine picture zatamine · Jan 28, 2015 · Viewed 166.2k times · Source

I work on WordPress based project and I want to patch my project at each new release version of WP. For this, I want generate a patch between two commits or tags.

For example, in my repo /www/WP I do this:

$ git patch-format com1..com2 --stdout > '~/patchs/mypatch.patch'

# or

$ git patch-format tag1..tag2 --stdout > '~/patchs/mypatch.patch'

/www/WP git natif WordPress

/www/myproject My git project WordPress based

The git apply command line doesn't work, I think because we are in different repositories.

Can I generate a patch file without a commit, just a differential and apply it to another git repository?

Thank you.

Answer

Enrico Campidoglio picture Enrico Campidoglio · Jan 28, 2015

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

Related questions

(git) diff output relative path?

I need to get some diffs in my repo that are not relative to the base of the repo, but instead relative to a given base or given path. By default I get: git diff diff --git a/path/to/…

Read More
How to apply `git diff` patch without Git installed?

How can my client apply patch created by git diff without git installed? I have tried to use patch command but it always asks file name to patch.

Read More
Creating a patch file from a diff of 2 folders

I made some changes to an open source project without taking time to create proper patch files. Now, the maintainer of the project released a new version, and among new and edited files, there are a bunch of renamed files. …

Read More