20 Sep '13, 7pm

Streamline your git workflow with aliases

Streamline your git workflow with aliases hgimenez April 19, 2011 git shell unix aliases My git workflow is heavily influenced by articles such as Rein’s or the topic branches workflow on the excellent ProGit book. The idea is simple: 1. Start a story with a new branch. From the master branch, run git checkout -b feature_x 2. Hack and commit often in that branch vi file.rb git add -u git add . git status git commit -m "Make changes" 3. Pull in upstream changes as often as possible There are many ways to do this. I like this method because it doesn’t require me to checkout or merge the master branch. Instead, just fetch the references from the remote and rebase it against your feature branch. Note that the reference we’re rebasing against is origin/master , so that we only bring in changes from that branch. git fetch git rebase origin/master 4. Clean up the history by squas...

Full article: http://robots.thoughtbot.com/post/4747482956/streamline-y...

Tweets