Dive into our latest TWIL installment, where Cuttlesoft delves into the ever-evolving world of software development with our adept Emily. This week, journey through the intricacies of Git with her enlightening piece on a Git alias for moving commits to a new branch, a must-have for streamlining your version control process. As a double feature, Emily also revives the utility of Dash, a robust documentation browser that ensures your coding flow remains uninterrupted, even when the grid can't keep up. Join us for this micro-learning session that promises to enrich your software development toolkit.
Git alias for moving commits to a new branch
Whether you accidentally commit directly to master or need to cherrypick commits due to branching off another branch, moving a series of commits to a new branch off of master is super helpful.
mt is short for "move to", which helped me remember the order of the arguments.
It will:
# gitconfig
[alias]
mt = "!f() { git checkout origin/master && git checkout -b $2 && git cherry-pick $1 && git checkout master && git reset origin/master --hard && git checkout $2; }; f"Usage
Say you accidentally made two commits on master and your log looks something like this:
* 678 - (HEAD -> master) [CUTL-001] ☔️ Tests for feature that should be on a branch
* 345 - [CUTL-001] ✨ Feature that should be on a branch
* 012 - (origin/master) [CUTL-001] ✨ Latest thing on masterYou can run:
git mt 345^..678 feature/new-thingI read this in my head as: "Move commits 345 thru 678 to a branch named feature/new-thing"
You could also add an argument to control which branch you want the new branch to branch off of, but I find that this is nearly always master for me.
- git
Dash
I used Dash years ago and am super happy to find that it's better than ever.
It's great for traveling or other situations where you may need to reference docs but don't have internet, as it lets you store docsets locally. I also like having a hotkey that immediately opens up the docs window. It also has great support for searching by class or method name, and has a nice explorer for class/method breakdowns.
- Tools
