Git Workflow Cheatsheet

Sun, 18 Jun 2017 16:55:42 +0000

👴 Careful You’re reading an old article ! Some links might be broken and content may be outdated

I follow a pretty regular git workflow on my projects:

All my features are derived from a master branch
I merge my feature with master only after a code review (If I work with several people on the project, I ask them. Even If I’m alone on the project, I still use Github’s Pull Requests to review myself).

My Git Cheatsheet

Delete a local / remote branch

git branch -D branch_name #locally
git push origin --delete branch_name    #remote

Create a branch from a commit

git checkout -b branch_name a9c146a09505837ec03b

Use Meld as an external viewer for git diff on Ubuntu

Wed, 20 Apr 2016 16:50:53 +0000

👴 Careful You’re reading an old article ! Some links might be broken and content may be outdated

This article explains very well how to use Meld as an external viewer for « git diff » on Ubuntu. Once done, you won’t have any valid excuses to escape code reviews 😉

Git on Laïla Atrmouh

Git Workflow Cheatsheet

My Git Cheatsheet

Delete a local / remote branch

Create a branch from a commit

Use Meld as an external viewer for git diff on Ubuntu