Note that you can use the triple dot syntax we saw earlier in order to compare those files. In order to see the differences done to this file, you would run the following command $ git diff master.feature - README
Let’s say for example that the file that you modified between those two branches is called “README”. In order to see the differences done to a file between two branches, use the “git diff” command, specify the two branches and the filename. In some cases, you may want to see all changes done to a specific file on the current branch you are working on.
* 802a2ab (HEAD -> feature, origin/feature) feature commit Compare specific file between two branches Using the example we provided before, this command would give us the following output $ git log -oneline -graph -decorate -abbrev-commit master.feature $ git log -oneline -graph -decorate -abbrev-commit branch1.branch2 In order to compare two branches using commit abbreviations, use the “git log” command with the following options. If you are not interested in all the information provided by this command, there is a way to get shorter commit lines. Note that this command won’t show you the actual file differences between the two branches but only the commits.īack to the example we provided before, comparing the commit differences between the master and the feature branch would be written $ git log master.featureĬommit 802a2abed7f88d67e0ab9a0e780b858651c5813b (HEAD -> feature, origin/feature) In order to see the commit differences between two branches, use the “git log” command and specify the branches that you want to compare. In some cases, you may be interested in knowing the commit differences between two branches. $ git diff branch1.branch2 Compare commits between two branches This is particularly true whenever you are checking out a new branch from the master branch : other commits might be integrated to master while you are working on your feature.Īs a consequence, in order to compare two branches, you almost always want to stick with the first method we described. However, developing on your own branch does not prevent the branch you checked out from to have other commits. When you are developing a new feature, you are most of the time doing it on your own branch. Most of the time, you want to stick with the first method, meaning using only two dots in order to compare two branches. So which method should you use in order to compare two branches? Using “git diff” with three dots compares the top of the right branch (the HEAD) with the common ancestor of the two branches.Īs always, a diagram speaks a hundred words, so here is the description of the diff command with three dots.
So what’s the difference with the previous command? In order to compare two branches, you can also use the “git diff” command and provide the branch names separated by three dots. Comparing two branches using triple dot syntax
#Smartgit vs sourcetree code#
Git is using a color code in order to display differences done between two branches : lines in green are lines added to the files and lines in red are the ones that are deleted from the files. $ git diff master.featureĪs you can see, one file has been added to the branch. In order to see what has been modified between master and feature, you would run the following command. Let’s say for example that you are looking to see the differences between a feature branch (being one commit ahead of master) and the master branch. In short, it will show you all the commits that “branch2” has that are not in “branch1”.
0 kommentar(er)
