Git: add branch.autosetupmerge.always, branch.autosetuprebase.local
Git: add branch.autosetupmerge.always, branch.autosetuprebase.local

Whenever creating a new branch, set it up to track the branch from which
it started; "true", the default Git behavior, does this for remote
branches, but the setting of "always" employed here does it for local
branches as well.

Likewise, when creating a new branch, set it up to automatically rebase
on pulling, but only for local tracking branches.

What this gives us:

  - `git status` will now show us how far topic branches are from their
    initial starting point
  - on a local topic branch `git pull` will rebase for us; I don't
    actually see myself using this, but neither does it look like it
    will hurt me

What this costs us:

  - `git fetch` no longer defaults to fetching from the origin; ie. on a
    topic branch created from a local branch, `git fetch` does nothing,
    and you have to `git fetch origin` (or similar) instead if you want
    to fetch from upstream

So, I've updated my `git refresh` alias to explicitly `git fetch
origin`, seeing as that what I usually want it to do.

Note: the `git status` output may not be as useful as it may seem at
first, because, for example, if you're on a topic branch and do `git
fetch origin` your local `master` will remain stale and your
`origin/master` will be updated; ie. your `git status` output will
continue to tell you how far ahead you are of the old `master`
reference. If you do a `git refresh`, your old `master` will look even
staler, and `git status` will tell you that you're [some large number of
commits] ahead of `master`, even if your topic branch is really only 1
or 2 ahead of `origin/master`.

I did consider adding a `git branch -f master origin/master` to my
`git refresh` alias to combat this, but decided not to as that would
blow away any local-only unpushed change that might be on the master
branch. A nested `git checkout master && git rebase origin/master && git
checkout -` might be preferable, although that is starting to get
complicated.

Signed-off-by: Wincent Colaiuta <c76ac2e9cd86441713c7dfae92c451f3e6d17fdc@wincent.com>

wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent,wincent/wincent