Search⌘ K
Home
Courses
Learn Git the Hard Way

Generate and Apply Patch

Explore how to generate patch files from specific commits using git diff-tree and apply them to another branch. Understand the causes of conflicts during patch application and learn how to resolve them manually or using the reject flag. This lesson guides you through handling patches and conflicts effectively in Git repositories.

We'll cover the following...

Generate patch

So far you’ve seen that the cherry-pick didn’t do what you wanted, and you’ve seen why. Now you’re going to use a different technique to achieve what you want.

First, revert the cherry-pick you started:

1	git cherry-pick --abort
Terminal 1
Terminal
Loading...

Now, you’re going to do two things:

  • Create a patch file that has the diff contained in the abranchtag commit within it.
  • Apply that diff to the master branch.

Patch files were originally created to pass changes round by email. The git format-patch command does this by default, creating a patch ready for email ...