Tag Archives: Git

Rewriting Git History with Rebase in Magit

Posted on 2016-09-05 by jcs

Charl Botha has a useful video on rewriting Git history with Magit. Botha gives three examples: Changing the commit message on any old commit Squashing two or more commits into one Splitting a commit into two or more separate commits … Continue reading →

Posted in General | Tagged , | Leave a comment

Undoing Git Actions

Posted on 2015-06-23 by jcs

Git is a wonderful thing and despite its reputation for being really hard to use, is easy to understand and use for the usual cases. The problems occur when you make a mistake and the easy mental model you have … Continue reading →

Posted in General | Tagged | Leave a comment

Git Problems and Solutions

Posted on 2015-03-24 by jcs

Nava Whiteford over at 41j has a useful list of common Git problems and their solutions. It’s almost like a mini-recipe book. For example, what if you made a mistake in your commit message? Whiteford tells you to use the … Continue reading →

Posted in General | Tagged | Leave a comment

Git Merge and Rebase Explained

Posted on 2014-09-17 by jcs

Git has become the de facto standard version control system. Many people find it confusing or even impossible to understand. In actuality, Git is based on some simple ideas that, once understood, make Git almost transparent. An example of this … Continue reading →

Posted in General | Tagged | Leave a comment

git-timemachine

Posted on 2014-07-28 by jcs

Recently, I’ve seen several references to the git-timemachine package. It didn’t seem that interesting to me so I ignored it. Then I noticed that Bozhidar Batsov is recommending it on Emacs Redux. When Batsov recommends something, it’s generally an indication … Continue reading →

Posted in General | Tagged , | 1 Comment

Automating Git Bisect

Posted on 2014-07-07 by jcs

I’ve written a couple of times about Git bisect. It’s a way of finding the commit that introduced an error. It works by (essentially) doing a binary search on the commit history. Now, Curtis Poe over at Ovid shows us … Continue reading →

Posted in Programming | Tagged , , | Leave a comment

Git Flow

Posted on 2014-03-17 by jcs

Recently I’ve seen a lot of articles about git-flow but it was sort of hard to understand exactly how to integrate into your work flow. Happily Kevin Basarab has come to the rescue with a video that shows you how … Continue reading →

Posted in Programming | Tagged , | Leave a comment

Git Stash

Posted on 2014-02-28 by jcs

Over at softwarecave there’s a nice post on using git stash. In git, the stash is basically a stack on which you can push your current changes while you so something else. Maybe you want to change branches without committing … Continue reading →

Posted in General | Tagged , | 2 Comments

Resolving Git Merge Conflicts with Ediff

Posted on 2014-02-17 by jcs

Leonardo Etcheverry has an excellent short post on how to resolve merge conflicts with Magit and ediff. For various reasons, I don’t often encounter merge conflicts so I always struggle with getting them resolved. Etcheverry’s post shows how easy this … Continue reading →

Posted in Programming | Tagged , | 2 Comments

Git Bisect Tutorial

Posted on 2014-02-14 by jcs

Back in December, I wrote about Randy Fay’s screencast on Git bisect. Now Matt Honeycutt has posted his own tutorial. It’s in the form of a blog post so if Fay’s video moved too quickly for you to follow, you … Continue reading →

Posted in Programming | Tagged | Leave a comment