How to setup Git Merge and Diff Tools with P4Merge

This post provides a step-by-step guide with a list of commands on how to setup the git merge and diff tools to make use of P4Merge.

Git Commands – Cheatsheet

The Git Cheatsheet can be downloaded from the images below. The Git Cheatsheet (PDF document) contains a list of the git commands that are frequently used. This cheatsheet document is not intended as a complete documented list of all commands and for that you should rather visit the official git documentation page.

Git Commands – Initial Setup

The git initial setup is performed only once after the installation is successful. This post will focus on the minimum set of properties that should be configured before you can use git.

Git Commands – Git Install

Depending on the operating system, there are numerous ways to install git. This post provides information on how to install git on Linux, Windows and Mac OS X.