git-start.md

JSDD > Start with Git

Versioning your collaborative work with Git

Here is a list of guidelines to how I manage my collaborative work, using the excellent versioning tools Git provides.

Contents

1. Understanding Git
2. Git tools
3. Some specific tasks
4. Workflows

Understanding Git

You should really read at least the first three chapters of the wonderful and extensive online book on Understanding Git by Scott Chacon.

In particular, the following pages are strongly recommended:

• What is version control

• Install and startup working with Git

• Git basics

• Interactive cheatsheet

Tools

This section is WIP

You can do all the job on the command line or use some gui tools :

• On Linux, git comes with everything already included :

  • git command line aliases (help wanted)

  • git gui + gitk (help wanted)

• On Windows:

  • git bash with MsysGit (help wanted)

  • many third-party git GUIs

Some specific tasks detailed:

• Ignore mistakenly tracked files

• Change your last commit's message

• Stage deleted files from anywhere in the working tree

Git workflows

For medium to large-scale projects, we use the Git Flow branching model.

• Git Flow cheatsheet