aanand/git-up — pull request #30 by decklin (2012-09-17 16:58:47+00:00)
Title: Don't automatically rebase; if rebase.auto is false, just print 'diverge...

This one may be a bit more controversial, but I'd like to turn off automatic rebasing (I know i can add options to the rebase command now, but sometimes I'd really rather deal with a branch later). This adds an option `rebase.auto` to control it, defaulting to the current behavior (rebase) if unset. If turned off, git-up does not rebase the branch.

In order to have the option default to true, I had it test for 'false'; i'm not sure if this is the best way to do it but it seems similar to other options. Callling it "noauto" seemed a little contorted.