With the changed colors you receive much better experience from your command line output.Īfter reading this article comparison of two different files and looking for changes between different revisions and branches should be no mystery for you. Your git should be set up to use diff tool p4merge. Also don’t forget that you can use graphical tools for displaying the history of the file like gitk and others. You can specify the path of the revision to the branch, relatively to the number of history commits and in more other ways you can ever dream about. You can also compare between two different commits with the following syntax. git log filenameįrom the output you can copy the commit identifier and run the difftool with the path to the version you want to compare with. You can list file revisions with the git log command. The first thing we want to do is to compare file against specific revision. The first command runs the difftool for all modified files and the second one compares only the specified file. # Starts git difftool for all modified files The usage is similar to the git diff from above. Let’s try it with comparing the working file against the revision in repository. From now on p4merge is ready to compare your files.
#Set up p4merge full
Otherwise you have to provide the full path to the exe file in the line. P4merge must be added to your system path. Git config -global 'p4merge.exe $LOCAL $REMOTE'
#Set up p4merge how to
Next steps show you how to setup p4merge as git difftool. There is a lot of different tools you can use and each setup would be a little different. It is a free, fast and it is capable of performing the most challenging merging and comparing tasks. It allows you to register comparison tool of your choice and to integrate it with git. For this purpose git provides a command difftool. If you are not satisfied with the simple text diff you need to use a custom tool. Just be aware that some of them are not available in the msysgit implementation on Windows.įor displaying the difference in just one file you have to add the file relative location and the file name. There is many more information in the output and I recommend to take a look at stackoverflow for their representation. Old lines are prefixed with the - sign and the new lines with the + sign. It displays all the differences in all your modified files from previously committed work. The most simple usage is to run the command without any parameters. This looks much better than the previous one, don’t you think? Usage Take a look at the screenshot and compare it with the previous one. Now the output in the Powershell window is much more readable. $global:GitPromptSettings.UntrackedForegroundColor = ::Yellow $global:GitPromptSettings.WorkingForegroundColor = ::Yellow Add the following lines to the end of the file and it changes the output from dark red to yellow. You have to edit your Powershell profile that is located in your documents folder and you can run $profile to see where exactly it is. Posh-git is a great tool but the information about modified, untracked and removed files aren’t readable. Let’s change the color from dark red to cyan and also modify the colors for changes to more shiny ones. The dark red used with git status and displayed changes doesn’t work very well with the blue background.įor changing git global configuration of modified and untracked files you need to run these commands.
#Set up p4merge windows
If you use git on Windows especially with Powershell and posh-git extensions you soon realize that some colors in the output are very hard to read. It is text based and easy to use with files with few line changes. Git already comes with the tool for file comparison. It helps you setup git diff tool and shows you how to use it to perform some basic comparisons of your changes to a current base and also few more advanced comparisons between specific commits. This article describes techniques that are available in git.
Compare Files with Git Diff Tool - Jakub Chodounský Jakub Chodounský Search
0 kommentar(er)
