Simple git workflow with hack and ship

[Superfud]

Branches are virtually free with git, it makes a lot of sense to create short-lived feature-branches for each new thing you start working on. This does mean a bit of shuffling back and forth to integrate changes from others in your local work, but this “pull changes and rebase my work” workflow can be greatly eased by these small scripts.

[jrockway]

Uh, his hack script is just "git pull --rebase". This is even the default when a fast-forward is safe.

[saurik]

You can even make it always the default by setting branch.<name>.rebase to true, and can make /that/ the default by setting branch.autosetuprebase to always ;P.

[mechanical_fish]

What about "ship"?

Meanwhile, has `git pull` had a `--rebase` since the dawn of Git time in 2005, or did it appear at one point?

[e40]

The " || exit 1" is unnecessary. Just use "set -e" at the top of the script once.

[gruseom]

Looking for more about this, I found a pretty good post:

http://www.davidpashley.com/articles/writing-robust-shell-sc...

[DanielRibeiro]

This workflow would probably also benefit from a gitc script, for fast committing:

#!/bin/bash

git commit -a -m "$*"