The git rebase command has a reputation for being magical Git voodoo that beginners should stay away from, but it can actually make life much easier for a development team when used with care. In this article, we’ll compare git rebase with the related git merge command and identify all of the potential opportunities to incorporate rebasing into the typical Git workflow.

GitLab is open source software to collaborate on code. Create projects and repositories, manage access and do code reviews.

So you’ve just pushed your local branch to a remote branch, but then realized that one of the commits should not be there, or that there was some unacceptable typo in it. No problem, you can fix it. But you should do it rather fast before anyone fetches the bad commits, or you won’t be very popular with them for a while

Guide to setting up Git for Windows

This tells git to automatically stage tracked files – including deleting the previously tracked files.

Wingman is an interface and workflow for managing your source in ways which map directly to creating software. We talk in terms of features, bugs, release candidates, releases and hotfixes.

This guide will help you setup your server and Rails 3.1 project for fast, zero-downtime deployments. I’ll be using Nginx+Unicorn to serve the application, git+capistrano for fast deployments.

At GitHub, we do not use git-flow. We use, and always have used, a much simpler Git workflow.

learn the basics

great “getting started with git” resource