Shulou(Shulou.com)06/01 Report--

This article mainly shows you "what is the difference between Git Reset and Git Revert commands". It is easy to understand and clear. I hope it can help you solve your doubts. Let me lead you to study and learn this article "what is the difference between Git Reset and Git Revert commands".

Background

In daily work, many colleagues often develop iteratively together, and there are often a lot of requirements developed on different branches of code. If some unfinished function is accidentally submitted and has been push to the branch, what should we do? Ah Fan recently encountered such a problem. Although the functional code submitted before is a complete function, due to various reasons, this function has been cancelled, and the relevant code also needs to be revoked and cannot be submitted to production, but there are also many other functional code submissions after this commit. Other functions still have to be online normally and cannot be affected.

At this time, many friends will say: can not you just modify the corresponding functional code that needs to be revoked? This kind of scheme is possible at that time, especially if we do not change much, we can directly modify the code back, which is convenient, simple and fast. However, if there are a lot of files to be modified, and there are a lot of changes in each file, it will be very troublesome. If you modify one line in advance, it will be a waste of time.

Git Reset/Revert

In this situation, all we can think of is that there must be relevant solutions on the Internet, and Git must provide corresponding commands that can help us. By consulting the Git manual, we found that Git provides two related commands for us to roll back the version, namely reset and revert. What's the difference between the two? Below, A Fan shows you the use and difference of these two commands through an example.

Git Reset

We first create several files in several times, and then commit and push to form multiple submissions. As shown in the following figure, we create four files, each of which is separate commit and push. Then we can view the log information of the entire submission through the git log command, which contains the file submission records of four times.

Now we suddenly find that there is a problem with the submission of the test3.txt file, and we need to roll back to the test2.txt version. We can force back to the specified version by executing the command git reset-- hard 15e32cd0cc909ef6791e4417f5572b5e7886f977-- hard, followed by the target version number.

Through the git log command, we can see that the current version has changed to the version we specified.

We then push the reset version to the remote server through the git push-f origin branch command. Since our local code already lags behind the server's code before pushing to the server, we need to add the-f parameter to force the push to the remote server.

Careful friends may find that we have implemented here, indeed back to the required version, but there is a problem if only the test3.txt file, and the test4.txt file is no problem, we can submit normally, if we operate in this way, we will lose the test4.txt version of the modification. Of course we can resubmit and write it again, but if there is a lot of content in this version, we can't change it. So we don't usually use this approach, and we can use it only if we make sure that all subsequent changes are not needed.

Git Revert

Let's take a look at how the git revert command is used. We create two files, commit and push, to the remote, and then through git log, we can see the following, and now the latest version is test6.txt. Similarly, at this time we found that there was a problem with the version of test5.txt, but the version of test6.txt was correct, and we just wanted to undo the submission of the test5.txt version.

At this point, we execute the command git revert-n 50896fa7d9ba16b63a0fc539bb6620411e5dee4c to revoke the test5.txt version, and execute git commit-m xxx to submit and then push to remote.

Through git log, we can see that a new submission has been generated to cancel the content of our test5.txt version, and the test6.txt version of the submission is still in place.

From the above demonstration, we can find that although both git reset and git revert commands can be used for version fallback, there are still a lot of differences when using them. We can use the git reset command directly when we confirm that commits after the version that needs to be rolled back are not needed, but when we just need to undo a version, we can use git revert.

These are all the contents of this article entitled "what's the difference between Git Reset and Git Revert commands". Thank you for reading! I believe we all have a certain understanding, hope to share the content to help you, if you want to learn more knowledge, welcome to follow the industry information channel!

Welcome to subscribe "Shulou Technology Information " to get latest news, interesting things and hot topics in the IT industry, and controls the hottest and latest Internet news, technology news and IT industry trends.