Gaui.is

Have you ever been busy working on a branch but needed to push something to another branch without disrupting work on your current branch? Enter the worktree feature! It was introduced in Git 2.5 and is very handy when working on multiple branches simultaneously, without disrupting your work on the other branch. It got me very confused at first but it’s quite simple.

My last post got fairly positive feedback, 77% upvotes on Reddit. But in the comments I was asked to add an important practical use-case, how to split commits. So instead of editing my previous post, I decided to make a new post demonstrating how I would do that.

Rebasing in Git is basically replaying commits on top of each other. But with interactive rebase you are in control of how they should be replayed and what should be done with them. You can re-arrange them, skip them, reword them, edit their changes and squash them together. This is a very powerful tool.

There’s a method in Git that can become very useful when working in large projects where it is hard to find where bugs originated from. This is the git bisect command and allows you to find by binary search the change that introduced a bug.

Let’s face it, Git is pretty raw, but it has the options to do cool stuff. That’s why I decided to make a post with the aliases I use all the time and couldn’t be without.

Most people write commit messages explaining in short what is in their commit, which in the long run tells other people NOTHING about the commit without having to go through the diff of the commit. But there is a better way to do this.