Git Essentials - Hack & Ship

If you’re like me, your normal git workflow looks something like this:

Do some work in a topic branch and need to rebase master into the branch.
git checkout master
git pull origin master (or fetch and merge)
git checkout topic-branch
git rebase master

Once you’re done with your topic branch, it might look something like this:

git checkout master
git merge topic-branch
git push origin master

That’s a lot of work, and as a developer we can definitely make that process easier. About 4 years ago, I came across a set of bash scripts that simplified this workflow greatly. The creator, Rein Henrichs, named them Hack && Ship.

These tools worked great, but weren’t flexible enough for me. They assumed that you would always be rebasing and pushing to the master branch. If this wasn’t the case, you had to do everything by hand.

Here are my updated versions of Hack && Ship that allow you to rebase and push to any branch (such as staging or qa):

Hack

#!/bin/sh # git name-rev is fail CURRENT=`git branch | grep '\*' | awk '{print $2}'` TARGET=$1 : ${TARGET:="master"} echo "=> git checkout ${TARGET}" git checkout ${TARGET} echo "=> git pull origin ${TARGET}" git pull origin ${TARGET} echo "=> git checkout ${CURRENT}" git checkout ${CURRENT} echo "=> git rebase ${TARGET}" git rebase ${TARGET}

Ship

#!/bin/sh # git name-rev is fail CURRENT=`git branch | grep '\*' | awk '{print $2}'` TARGET=$1 : ${TARGET:="master"} echo "=> git checkout ${TARGET}" git checkout ${TARGET} echo "=> git merge ${CURRENT}" git merge ${CURRENT} echo "=> git push origin ${TARGET}" git push origin ${TARGET} echo "=> git checkout ${CURRENT}" git checkout ${CURRENT}

To use them, create two files named hack and ship somewhere in your path (like /usr/local/bin maybe) and make them executable. Then, you can invoke them like so:

hack or hack staging

push or push qa

hack && ship

NoMethodError

raise "a blog about rails, javascript, and other stuff"

Git Essentials - Hack & Ship

Hack

Ship

Comments