Merge branch 'jk/show-upstream'
commit3e52effcf6efa9ef27b3d67d13f535a0381e3bf2
authorJunio C Hamano <gitster@pobox.com>
Sun, 12 Apr 2009 23:46:42 +0000 (12 16:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 12 Apr 2009 23:46:42 +0000 (12 16:46 -0700)
tree5361ee873615264333932f876287ee66287970e6
parentc276857ee250ca1c3a36cba8358f50ba01e97917
parent2d8a7f0b30b4f9ef750ab763aabec117ffe4e749
Merge branch 'jk/show-upstream'

* jk/show-upstream:
  branch: show upstream branch when double verbose
  make get_short_ref a public function
  for-each-ref: add "upstream" format field
  for-each-ref: refactor refname handling
  for-each-ref: refactor get_short_ref function
refs.c
refs.h