Moving unstaged changes to another branch in Git
If you move around between different branches a lot in Git, you might find that you accidentally make some changes on the wrong branch and only realise this when it …
Git commits made directly to branch
Sometimes in Git I’ll need to synchronise a long-lived feature branch with master to reduce the likelihood of merge conflicts at a later date. One of the problems with doing …
Copying a file from another branch in Git
Copying a file from another branch into my current branch is something I do every so often in Git, e.g. when I want to reset a file in staging to …
Self-hosted Git using SSH
Most of my Git needs are met by GitHub (public) and BitBucket (private), but occasionally I want to hold confidential data on a server which I control. There are self-hosted …
Training courses under development
About a month ago, I posted about the possibility of charging for training notes. Based on the feedback I received via Twitter, I’ve decided to make all future training notes …
Charging for training notes?
Earlier this year I delivered a half-day workshop entitled Configuration Management with Ansible and Git. I spent a lot of time preparing the notes for the workshop, and as a result …
Configuration management with Ansible and Git slides
Earlier this week I delivered a talk entitled Configuration Management with Ansible and Git at the FLOSS UK Spring conference. I’ve now uploaded the slides for my talk, which you can view …
Deleting branches in Git
For some projects, the workflow I use in Git is to create a new branch for every new feature or bug fix. This works well for keeping things separate, but …
Find Git commits by email address
Often in Git you’ll want to find a list of commits from a given author or organisation. Fortunately this is a simple enough task with two arguments to git log: git …
Shallow cloning with Git
Sometimes when you clone a Git repository, you just want a snapshot of the code without all the history associated with it. This is known as a shallow clone and …