Git commands I use all the time for dealing with branches.

September 25, 2012; 1 min read

This isn’t anything new, but I use these all the time so it’s nice to have something to point to for git newcomers.

# create a new branch and check it out
git checkout -b BRANCH
# list all branches—you should prune regularly to keep the list small
git branch
# delete a local branch that’s been merged in—it’ll complain if it has changes not merged into your current branch
git branch -d BRANCH
# after deleting locally, delete remotely
git push origin :BRANCH
# Let’s say I committed to master, but haven’t pushed to github
# and I realize the commit should be on a branch (to make a pull request from)
git checkout -b BRANCH
git checkout master
git reset head^ –hard # This will wipe out your last commit, so don’t do this before checking that the commit is indeed on another branch

Share

Tags

Similar Articles

Another day, another Zero Day: What all Digital Development organizations should take away from recent IT security news

Even if you don’t work as a software developer, you probably heard about recent, high profile security issues that had IT Admins and developers frantically patching servers over the holidays and again more recently. Dimagi's CTO shares what these recent issues mean for Digital Development organizations.

Technology
January 28, 2022

Join the fight to support critical open source infrastructure

Open Source tools are a critical piece of global infrastructure, and need champions for long term investment

Technology
March 17, 2020

Two big lessons that Iowa and Geneva can teach us about technology in digital development

Last week brought two high profile technology failures into the global spotlight. Although these two mishaps may seem quite different at first glance, they both highlight challenges that are inherent in providing software in the public sector (regardless of locale) and illustrate cautionary lessons worth discussing for practitioners in Digital Development. The Iowa Caucus Debacle

Technology
February 7, 2020

The World's Most Powerful Mobile Data Collection Platform

Start a FREE 30-day CommCare trial today. No credit card required.

Get Started

Learn More

Get the latest news delivered
straight to your inbox