Commit Early, Commit Often – git merge –squash

Overview In a previous post I described one of the ways that history can be re-written in git with an interactive rebase by "squashing" multiple commits together. Since we are heading into Fall, I will demonstrate a similar feature, merge --squash. The Merge Squash In the example below, feature branches off of master at "Commit … Continue reading Commit Early, Commit Often – git merge –squash →

Commit Early, Commit Often – Amend

Overview The amend command in git is another helpful tool that I use on a regular basis. It again is one of the features that really leaves no excuse of committing early, and committing often. This short tutorial will demonstrate how to use it. Amend Imagine that you've been developing some awesome software, and you've committed … Continue reading Commit Early, Commit Often – Amend →

Commit Early, Commit Often – The Interactive Rebase (Delete)

Overview In a previous post I described how to squash and/or fixup commits using an interactive rebase. In this short tutorial I will describe how to remove commits from the tree. Delete Looking at the state of our git repository from the last git tutorial, let's suppose (for some very strange reason) you wanted to … Continue reading Commit Early, Commit Often – The Interactive Rebase (Delete) →

Commit Early, Commit Often – The Interactive Rebase (Squash and Fixup)

Overview I've been using git for over 7 years and have had the privilege of mentoring a small number of people in their understanding and use of git. One of the ideas that I always try to impress upon git beginners is the very light-weight nature of commits. I almost always use the adage, "commit … Continue reading Commit Early, Commit Often – The Interactive Rebase (Squash and Fixup) →