Git patch is a feature in
git which enables you to create a patch file from a feature in one branch and apply it in another branch. A patch file has all the differences between the two branches. Using the patch file, we can apply the changes in a different branch. This can be visualized as - Suppose you are working on a project. The main project is in the "master" branch. You are working on a feature on a separate branch named "feature1". Now, you make all the changes in the "features1" branch and then create something known as a "patch file". Now, this patch file can be used in the master branch to add that particular feature you worked on.
Creation and Working of Patches
Let's see the following example:
Step 1: There is a repository named 'Pat'. The user created a file "text.txt" in the master.
Step 2: Then it is added to the master branch and the change is committed with a message "initial".
Step 3: Checking logs
Step 4: Now, let create a new branch named
feature and checkout to our
feature branch.
Step 5: Change the "text.txt" by adding a few words.
Step 6: Next, we will save these changes, add and commit the changes in our
feature branch with a message "this is in feature branch".
Step 7: Checking logs
Step 8: Now comes the main part- Creating a
patch file. For creating a patch file we will write
git format-patch {branch in which we will apply our patch file} -o {folder in which we will save our patch file}
Currently, we are in the
feature branch. We need to compare our changes to the branch where we want to apply our changes(here
master branch). Then we use "-o" and specify the folder in which the patch file will be created (this is optional).
We can also create a patch file using a particular commit's hash key. For example:-
git format-patch -1 012fe999affd9b92f6c96eb72a7260273411ea81 -o patches
The hash key is present in the git log written in dark yellow.
Step 9: Now, we come back to our
master branch and check our "text.txt".
Note: Here, "cat text.txt" is used to view the file. This may not run in Windows. Please use Notepad or any code editor to view this.
Step 10: Now, we finally apply our patch file in the
master branch.
git am {path to patch file} 
Step 11: Checking logs
Similar Reads
Introduction to Github Collaboration and version control are important for software development. GitHub has become an important platform for developers, enabling seamless teamwork and efficient project management. In this article, we'll introduce you to GitHub, explaining what it is, how it works, and why it's a must-have
6 min read
Git Introduction Git is a powerful and widely used version control system that helps developers track changes in their code, collaborate with others, and manage project history effectively. Whether you are a professional developer or just starting out, understanding Git is important for modern software development.
5 min read
Using Patches in Git Git allows developers to manage changes, collaborate with others, and maintain a history of their work. One of the lesser-known but highly useful features in Git is the ability to create and apply patches. This article will guide you through the process of using patches in Git, including creating pa
4 min read
What is Git Interactive Rebasing? In the version control system, Git becomes a powerful and flexible tool for managing project history. Among its list of features, Git interactive rebasing stands as a powerful tool. In this article, we will learn more about Git Interactive Rebasing. Table of Content What is Interactive Rebasing?Prim
4 min read
Staging in Git In this article we will try to understand each and every aspect which may help us to understand about Staging in Git. To keep a track of modifications or changes in the file we have to bring that changes to our staging area which we bring by using Staging. Below command and this process of adding th
8 min read