From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 21 Jun 2009 04:47:13 +0000 (-0700)
Subject: Merge branch 'sb/pull-rebase'
X-Git-Tag: v1.6.4-rc0~48
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=12d4ffaa94c1379c307cdf489565531c5d6c94fd;p=git.git

Merge branch 'sb/pull-rebase'

* sb/pull-rebase:
  parse-remote: remove unused functions
  parse-remote: support default reflist in get_remote_merge_branch
  parse-remote: function to get the tracking branch to be merge
---

12d4ffaa94c1379c307cdf489565531c5d6c94fd