To change the default ‘merge’ program to vimdiff, run: Git config -global user.email you want to learn more about git, view the free online book. Git config -global user.name “Jonathan Manton” Installing git is straightforward just go to the download page. The following instructions are valid for linux or Mac, using a recent version of git (tested with git version 1.7.11.1). Note: A long hypen (-) actually means two hyphens next to each other, which is the standard way of specifying ‘long options’ on the command line. (Although ending up in this situation is best avoided, it is possible to recover by recreating the shared repository from the local repositories.) Therefore, pushes should be infrequent and/or coordinated via email. Warning: If two people ‘push’ to the repository at the same time then corruption may occur. Although there are various ways of setting up an online repository, perhaps the fastest way to start is by using Drop Box or Google Drive (or equivalent) to share a repository for a specific project.

Distributed version control software (git, mercurial, …) provides a safe and convenient means for people to collaborate on projects, including the writing of academic papers using latex.

Latex paper dropbox