Tag Archives: git

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

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)

Github Flow

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)

Linus Torvalds on git

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

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

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

Episodes:

  1. Git Setup and Init
  2. Git Normal Workflow
  3. Git Interactive Add
  4. Git Log
  5. Git Browsing
  6. Git Branching and Merging
  7. Git Rebasing
  8. Git Distributed Workflow

(Full Story: GitCasts)


Follow

Get every new post delivered to your Inbox.