Gitflow

The goal of this repository is to have a shareable reference point for working with git, specifically using the gitflow branching model. Everything in this guide is heavily inspired and based on nvie's original blog post. As he correctly realised, the easiest way to teaching git is using a "big picture" figure:

<a href="https://github.com/eschmar/gitflow/blob/master/gitflow.pdf"> <img width="580" src="https://github.com/eschmar/gitflow/raw/master/img/pdf-link.png" alt="Gitflow Life Cycle PDF Version"> </a>

Is this guide for you? Gitflow works well in mid-sized teams with multiple deployment environments. There are reasons for not using any dev branch at all (in flat organisations), but it requires continuous live deployment, which is not always possible (when working for a customer, rather than on a product).

Since there is already comprehensive documentation on Git basics available on the internet and this aims more to be a reference about gitflow, they won't be covered here. Instead, I assume that you are already somewhat familiar with git and refer you to other resources otherwise:

• git - the simple guide
• Got 15 minutes and want to learn Git?

Please take your time and ask your peers in case something is unclear! Once you're somewhat comfortable with git and you're interested to understand better how git works itself, i can recommend this talk: Deep Dive into Git - Edward Thomson.

It's advisable to have a printed version of the PDF at hand and trying the commands on a testing repository.

Table of contents

1. Getting Started
   • Branch types
   • Pull Requests
   • Forking
2. The Big Picture
   • Project setup
   • Hotfix
   • Feature/Bugfix
   • Release
   • Rebase
   • Clean up
3. Nuggets
   • Git reset
   • Git log
   • Advanced rebasing
   • Checkout Pull Requests
   • Reduce local Git folder size
   • Useful commands

---

Start here: Getting Started