git diff by default shows difference between your working directory and the index (staging area for the next commit). If you have already added (staged) the changes to the staging area, git diff –staged does the job. Staging area is the data from which the next commit will be formed by git commit. P. S. … Read more
It’s the one in the middle : BASE. In fact, BASE is not the common ancestor, but the half-finished merge where conflicts are marked with >>>> and <<<<. You can see the file names on the top of meld editing window. See the screenshot here You can edit the BASE file as you want with … Read more
Short & sweet: git config –global diff.tool meld This configures Git to use meld as the diff tool. (You don’t need to specify the command line arguments, support for meld is built into Git.) Then, if you want a graphical diff instead of a textual one, you simply invoke git difftool instead of git diff … Read more
How do I set up and use Meld as my git difftool? git difftool displays the diff using a GUI diff program (i.e. Meld) instead of displaying the diff output in your terminal. Although you can set the GUI program on the command line using -t <tool> / –tool=<tool> it makes more sense to configure … Read more