ProDeveloperTutorial.com

Tutorials and Programming Solutions
Menu
  • Shell Scripting
  • System Design
  • Linux System Programming
  • 4g LTE
  • Coding questions
  • C
  • C++
  • DSA
  • GIT
  • 450 DSA Cracker
  • 5G NR
  • O-RAN

Chapter 4: GIT basics Part 2

prodevelopertutorial August 3, 2020

In the previous chapter, we say basic operations on git. This chapter is a continuation of the previous chapter.

in this chapter we shall learn about below commands:

git diff
git apply

Before we start with “git diff”, create a “myProg.c” file and do “git add” and “git commit -m “initial commit” “.

myProg.c

#include<stdio.h>

int main()
{
printf("Hello World\n");

return 0;
}

Finally your “git status” should be like below:

myProg.c

git diff

1. “git diff” is used to get the new code that has been added to the file that is staged/comitted. This command can be used in many different scenarios. Some of them are explained below:

To get the additional code added to the source file after it is comitted:

for example, if I add a new line “printf(“New line one\n”);” ” to the source file above and use the below command to get the diff.

git diff > myFile.diff

When you open myFile.diff, it will look like below:

git diff

As you can see in the above image, there is a “+” symbol, it means that a new line is added.

if there is a “-” symbol, then a line is deleted.

To get the additional code added to the source file after it is staged:

If the changes are staged, then to get the diff, you need to append “–staged” option, as shown below:

Now I have staged the file “myProg.c”, so to get the changes in staged files use “git diff –staged > myFile.diff”

.To know the difference between 2 different

If you have 2 diff files, you can also check the diff between them by using below command:

“git diff fileOne.diff fileTwo.diff”

git apply

1. Now you got a diff file. How do you apply it?

2. You will use “git apply <diff file name>”.

Example:

I have a diff file “myfile.diff” and it’s content as below:

git apply

And I want that diff to be applied to the source “myProg.c” file.

To apply that diff, I use:

“git apply myfile.diff”

git apply

In the output of “cat myProg.c”, the new line has been added.

Share
Email
Tweet
Linkedin
Reddit
Stumble
Pinterest
Prev Article
Next Article

About The Author

prodevelopertutorial

Follow this blog to learn more about C, C++, Linux, Competitive Programming concepts, Data Structures.

Leave a Reply Cancel Reply

You must be logged in to post a comment.

ProDeveloperTutorial.com

Tutorials and Programming Solutions
Copyright © 2023 ProDeveloperTutorial.com
We use cookies on our website to give you the most relevant experience by remembering your preferences and repeat visits. By clicking “Accept”, you consent to the use of ALL the cookies.
Do not sell my personal information.
Cookie SettingsAccept
Manage consent

Privacy Overview

This website uses cookies to improve your experience while you navigate through the website. Out of these, the cookies that are categorized as necessary are stored on your browser as they are essential for the working of basic functionalities of the website. We also use third-party cookies that help us analyze and understand how you use this website. These cookies will be stored in your browser only with your consent. You also have the option to opt-out of these cookies. But opting out of some of these cookies may affect your browsing experience.
Necessary
Always Enabled
Necessary cookies are absolutely essential for the website to function properly. These cookies ensure basic functionalities and security features of the website, anonymously.
CookieDurationDescription
cookielawinfo-checkbox-analytics11 monthsThis cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Analytics".
cookielawinfo-checkbox-functional11 monthsThe cookie is set by GDPR cookie consent to record the user consent for the cookies in the category "Functional".
cookielawinfo-checkbox-necessary11 monthsThis cookie is set by GDPR Cookie Consent plugin. The cookies is used to store the user consent for the cookies in the category "Necessary".
cookielawinfo-checkbox-others11 monthsThis cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Other.
cookielawinfo-checkbox-performance11 monthsThis cookie is set by GDPR Cookie Consent plugin. The cookie is used to store the user consent for the cookies in the category "Performance".
viewed_cookie_policy11 monthsThe cookie is set by the GDPR Cookie Consent plugin and is used to store whether or not user has consented to the use of cookies. It does not store any personal data.
Functional
Functional cookies help to perform certain functionalities like sharing the content of the website on social media platforms, collect feedbacks, and other third-party features.
Performance
Performance cookies are used to understand and analyze the key performance indexes of the website which helps in delivering a better user experience for the visitors.
Analytics
Analytical cookies are used to understand how visitors interact with the website. These cookies help provide information on metrics the number of visitors, bounce rate, traffic source, etc.
Advertisement
Advertisement cookies are used to provide visitors with relevant ads and marketing campaigns. These cookies track visitors across websites and collect information to provide customized ads.
Others
Other uncategorized cookies are those that are being analyzed and have not been classified into a category as yet.
SAVE & ACCEPT