Real-life git-flow

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 …

Read moreReal-life git-flow

the skinny on git-flow

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 …

Read morethe skinny on git-flow

VCS as Biographer

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 …

Read moreVCS as Biographer

Stupid git tricks: transferring part of one git repo to another

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