Merge branch 'jc/clone-branch-rebase'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2009 21:29:49 +0000 (14:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2009 21:29:49 +0000 (14:29 -0700)
commit0f64f874317a67d4d32bc10d85cf19e27ff0e43b
tree772cfd2b104ea3a9fb55f2265bfc7073746757f7
parent72c2de5c416baaaad16ab36a88b518d1aacf2a87
parent72f600832f75db626fd9290a21d02d49c92ca9ca
Merge branch 'jc/clone-branch-rebase'

* jc/clone-branch-rebase:
  Improve "git branch --tracking" output
  Make git-clone respect branch.autosetuprebase

Conflicts:
builtin-clone.c
builtin-clone.c