If you’re using git but you don’t really get it, this video is for you. In forty minutes, go from “git is hard” to grasping reset, merge, fast-forward, and (simple) rebase. Or better yet – come to Chattanooga on 30 August 2012 to see this talk live and expanded at DevLink! Git Happens on Vimeo Thanks …
The concepts of git-flow are elegant and simple, but the examples show only one repository. Using git-flow on a team is a little more complex. This post endeavors to describe the setup process and branching considerations when git-flow is used in a team environment. If you’re the person who wants to bring git-flow into your …
Today we switched over from chaotic use of git to the more systematic git-flow. We made our first release, we finally have production code to track, so it is time to get organized. Here’s the fifteen-minute rundown for coworkers:Git-flow is a methodology for using git, and a git extension that streamlines it. Here’s what you …
Say you’re working along on a branch (let’s say master), and suddenly you realize that this task is harder than you thought. You wish you had started a branch for this feature, back before you began it. Now you need to work on a bug instead, so you’ve got to put these changes away — …
Git gives us all this amazing power to control what we commit and when. We can even go back and modify commits to rewrite history. This power is dangerous. What’s the point of having it? The reason is that our version control history tells a story of our project. It is up to us what …
Reference post. Don’t expect this to be interesting. We had a particular subdirectory of a repository (repoA) that really belonged in repoB. The goal is to transfer all files and history from repoA to repoB, permanently. Thanks to Nikolai in this blog post, the move isn’t too bad. I’m not going to repeat his instructions. …
Read moreStupid git tricks: transferring part of one git repo to another
Want to apply just one commit from one branch into another branch? Don’t merge — that’ll bring in all the commits behind the one you want. The secret is: git cherry-pick To find the commit name, you can “git log “To see the contents of the commit, you can “git show “ Be in the …
Read moreGit is hard: applying single commits to another branch
If you’re used to subversion and cvs, using git can be mind-bending. It does all the same things (and more), but nothing in quite the same way. Idiomatic git means creating local branches, doing lots of little commits, then altering your local commit history if needed before pushing to the shared repository. Today I tried …