Skip to content

Instantly share code, notes, and snippets.

View EllenB's full-sized avatar

Ellen Brock EllenB

  • Bangalore, India
View GitHub Profile
@EllenB
EllenB / README.md
Created February 8, 2018 09:23 — forked from hofmannsven/README.md
My simply Git Cheatsheet
@EllenB
EllenB / gitcom.md
Created February 13, 2018 13:50 — forked from jednano/gitcom.md
Common git commands in a day-to-day workflow

Git Cheat Sheet

Initial Setup

Create an empty git repo or reinitialize an existing one

$ git init
@EllenB
EllenB / git-feature-workflow.md
Created February 21, 2018 03:30 — forked from blackfalcon/git-feature-workflow.md
Git basics - a general workflow

There are many Git workflows out there, I heavily suggest also reading the atlassian.com [Git Workflow][article] article as there is more detail then presented here.

The two prevailing workflows are [Gitflow][gitflow] and [feature branches][feature]. IMHO, being more of a subscriber to continuous integration, I feel that the feature branch workflow is better suited.

When using Bash in the command line, it leaves a bit to be desired when it comes to awareness of state. I would suggest following these instructions on [setting up GIT Bash autocompletion][git-auto].

Basic branching

When working with a centralized workflow the concepts are simple, master represented the official history and is always deployable. With each now scope of work, aka feature, the developer is to create a new branch. For clarity, make sure to use descriptive names like transaction-fail-message or github-oauth for your branches.