branching for repos with multiple remotes

[jm3]

multi-headed hydra remote style 🐉 #pacificrim

[jamiew]

💰

[jamiew]

I also very much enjoyed testing this patch by using the patch's remote branch

$ git remote add jm3 https://github.com/jm3/git-friendly.git
$ git fetch jm3
$ branch multiple-remotes
* Tracking existing remote branch...
Branch multiple-remotes set up to track remote branch multiple-remotes from jm3 by rebasing.
Switched to a new branch 'multiple-remotes'
$ say 'fuck yeah'

[jamiew]

Funny bug I just hit: branch master tried to have me track "heroku/master" rather than "origin/master"

All still seems to work OK, but wonder what's desirable there?

[jm3]

Doh, we can do better than that! Behavior should be: If the named branch exists on multiple remotes, track the first
remote alphabetically with the named branch, UNLESS one of the remotes is named origin, then track that one. I rebased onto your master, added a new commit with the updated behavior, and then force-pushed to my topic branch again so the updated branch should "just appear" in this pull request. (If you see a few commits below just ignore; Github includes them because they reference this issue number, even though I rebased the commits out.)

Testing repo = so meta

$ git br -a
* foo
  master
  remote-test
  remotes/dropbox/master
  remotes/fake-heroku/master
  remotes/heroku/master
  remotes/origin/HEAD -> origin/master
  remotes/origin/foo
  remotes/origin/master
  remotes/z-alphabetically-last/master