git: No bad puns in title
Regular readers will already know that my current employer recently switched from Subversion to Git for version control. Many people are making such a switch, and Git is definitely the “cool new kid”...
View ArticleHow remote branches work in Git
One of the things that confuses many new git users is how branches work between a local repository and a remote. This is always something I have to explain in my git training classes, so I figure that...
View ArticleStupid git tricks
This is the first in an ongoing series of posts about basic and not so basic ways to use git. Many of these come from a wiki page I maintain at work, with the examples changed to use the git repository...
View ArticleStupid Git Tricks 2
Some handy information and tips about Git branching • Tracking branches: “I just cloned a repository and all I see is ‘master’ — but there are many other branches in this repository, and I need to work...
View ArticleMy Favorite Things, Part 2: Git accessories
Git is definitely one of my favorite things but I already wrote about it, so I decided to write about some of the git add-ons that make my life easier. They are: gitosis, gitX, gitweb, and {OpenGrok....
View ArticleStupid Git Tricks #3: A few words about merging
Fast-forward merges There’s a notion that’s actually in all version control systems, but which is more readily apparent in git, namely, the so-called “fast-forward” merge. Charles Duan offers this...
View ArticleStupid Git Tricks #4: Pushing and pulling
You should almost never have to do a push of the form $ git push origin something:somewhere This is a good way to accidentally create a branch on the remote that you didn’t mean to, which an admin then...
View Article