Git - Giant Robots Smashing Into Other Giant Robots

- All Topics
- Design
- Development
- Product
- More topics
Keep Autogenerated Files Synced

Have you ever tried to find a bug that only exists in staging, and no one knows why? That’s not nice at all.
Jonas Meinerz
September 21, 2020
- Continuous Integration
- Code Review
- Git
- Bundler
- Yarn
- NPM
- Rails
It's time for a new branch

It’s easy to check out new branches in Git. We’re moving forward with main and leaving master for the reflog.
Joe Ferris
August 31, 2020
- News
- Git
Powerful Git Macros For Automating Everyday Workflows

Improve your everyday git workflows by automating the boring stuff.
Wil Hall
May 14, 2020
- Git
- DevTools
- Unix
- Shell
- Productivity
Confirm your changes at the end of a git rebase

It’s not always obvious what changed in your code after a git rebase. This tool makes changes more visible and helps you undo them if needed.
Jonas Meinerz
April 28, 2020
- Git
- Development
- Workflow
- Productivity
Adventures with git Rebasing

git rebase –onto is a useful tool for rebasing your branch off of another branch that has itself been rebased or had its history rewritten.
Stephen Hanson
February 10, 2020
- Git
Splitting a Commit

My workflow usually involves squashing many commits into a single one. But sometimes, the workflow calls for the opposite action – splitting a single commit into many. This is how I do it.
German Velasco
February 7, 2020
- Git
Dumpster Diving through Dotfiles: Remote Git Branches

Don’t let your git repo become a graveyard of stale branches. But how do you even know what branches are there? Let me introduce you to git branches.
German Velasco
November 6, 2019
- Git
- Dumpster Diving Through Dotfiles
.git/safe

How to use .git/safe to trust the bin/ directory in your git repo.
Ian Zabel and Mike Burns
July 29, 2019
- Shell
- Git
- Rails
Dumpster Diving through Dotfiles: Better Git Logging

There are pearls to be found. Check out these git logs.
German Velasco
March 25, 2019
- Git
- Dumpster Diving Through Dotfiles
Don't forget the silent step when you squash and merge

GitHub’s squash and merge button is great. But make sure to write a good commit message before you confirm those changes.
German Velasco
December 24, 2018
- Git
- Tools
Sign up to receive a weekly recap from thoughtbot

Your email address

Looking for even more ways to stay connected?

Check out our feeds

Sign up to receive a weekly recap from thoughtbot