![]() ~/learngitwithme/learngitwithme$ git difftool -cached README. This command will show us the diff between the staging area and the git repository. ![]() Notice we are using âdifftoolâ instead of âdiffâ. Let then do âgit difftool âcached README.txtâ. so we have a file that has been modified and added to the staging area. There are several good tools, but the one we're comfortable with is P4Merge. Good and free merging tool is essential when resolving conflict during rebasing or merging. Your branch is up-to-date with 'origin/master' In previous post, we have discussed on setting up Babun in Windows, the next step was to set up a good merging tool to work with Git. ~/learngitwithme/learngitwithme$ git status Let us first check the current status of the files in the working directory. With the third, you will not be prompted everytime git has to open the diff tool for you. 3Installing Git 3.1Downloading and installing Git 3.2Downloading everything else 3.2.1A default text editor for Git 3.2.2A difference and merge tool 3.3. The first two commands are self explanatory. Choose Browse by component->Clients->Visual Merge Tool as you do not want to download the whole Perforce client. Git config -global '/Applications/p4merge.app/Contents/MacOS/p4merge' You can do this by running the following commands: Install Perforce P4Merge Double click the downloaded EXE file Unselect the Administration tool P4Merge 01 Leave the server as is, we will not use it Just. Setup git config to use p4merge as the default diff (and merge) tool
0 Comments
Leave a Reply. |