Everything you need to know to master git, Part 1, setting up git environment, GUI, mergetool, difftool

Installing prerequisite

Configuring Git Environment

First config your environment and set a proper merge/ diff tool.  The settings are in /home/<username>/.gitconfig

All these setting can be set or viewed via terminal, i.e

To view current settings:

To set them

All available options for setting a merge tools can be listed by:

here we config it for meld, kdiff3 and vim.


Add the following to your .gitconfig file



User name, Email and editor


Adding Alias


SSH key

and upload your public key


into your GitHub account

Leave a Reply


This site uses Akismet to reduce spam. Learn how your comment data is processed.

Notify of