Brent Sordyl's blog » git

Visualized Git best practices for team: branch, merge, rebase

Brent Sordyl — Mon, 30 Jan 2012 15:02:22 +0000

1 – Stop using GUI for git, seriously, it’s not that many commands
2 – Be safe, branch out, commit often, merge often
3 – Git rebase to be used on the current branch
4 – Replace git pull with git pull –rebase

(Full Story: Visualized Git best practices for team: branch, merge, rebase)

git – the simple guide

Brent Sordyl — Thu, 12 Jan 2012 13:39:28 +0000

(Full Story: git – the simple guide)

Github Flow

Brent Sordyl — Mon, 19 Sep 2011 19:47:22 +0000

1. Anything in the master branch is deployable2. To work on something new, create a descriptively named branch off of master (ie: new-oauth2-scopes)3. Commit to that branch locally and regularly push your work to the same named branch on the server4. When you need feedback or help, or you think the branch is ready for merging, open a pull request5. After someone else has reviewed and signed off on the feature, you can merge it into master6. Once it is merged and pushed to ‘master’, you can and should deploy immediately

(Full Story: Github Flow)

25 Tips for Intermediate Git Users

Brent Sordyl — Tue, 12 Jul 2011 13:21:43 +0000

(Full Story: 25 Tips for Intermediate Git Users)

Sprout: The Easy Git Client for Mac

Brent Sordyl — Tue, 17 May 2011 19:14:56 +0000

(Full Story: Sprout: The Easy Git Client for Mac)

Tower – The most powerful Git client for Mac

Brent Sordyl — Tue, 10 May 2011 21:04:11 +0000

(Full Story: Tower – The most powerful Git client for Mac)

Linus Torvalds on git

Brent Sordyl — Wed, 20 Apr 2011 16:58:01 +0000

Linus Torvalds visits Google to share his thoughts on git, the source control management system he created two years ago.

(Full Story: Linus Torvalds on git)

The State of Version Control – FogBugz Blog

Brent Sordyl — Tue, 08 Mar 2011 14:00:46 +0000

Subversion is still the big gorilla in the room. 47% of developers use it as their primary version control system at work. But, distributed version control systems (DVCSes) are coming on fast! Git and Mercurial have each stolen 14% of developer allegiances. And, CVS, Perforce, and Visual SourceSafe, once dominant, are now on the run.
For one, Windows 7 has already become the leading development platform, with 31% of programmers using it as their primary platform for coding. 70% of programmers today are Windows based, 16% use Ubuntu/CentOS or other Linux, and 14% use Mac O

(Full Story: The State of Version Control – FogBugz Blog)

Git Community Book

Brent Sordyl — Mon, 28 Feb 2011 20:46:53 +0000

Welcome to the Git Community Book. This book has been built by dozens of people in the Git community, and is meant to help you learn how to use Git as quickly and easily as possible.

(Full Story: Git Community Book)

GitCasts

Brent Sordyl — Thu, 24 Feb 2011 17:22:40 +0000

Episodes:

Git Setup and Init
Git Normal Workflow
Git Interactive Add
Git Log
Git Browsing
Git Branching and Merging
Git Rebasing
Git Distributed Workflow

(Full Story: GitCasts)