Merge branch 'sb/pull-rebase' into next
commit85e52c0c82d390b193db4701985e838d423e7c4d
authorJunio C Hamano <gitster@pobox.com>
Sun, 14 Jun 2009 00:11:12 +0000 (13 17:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Jun 2009 00:11:12 +0000 (13 17:11 -0700)
tree526ca79fa4b016cee5997fbd56a5c7b2b4dd2414
parentf2c7e804855a9718de5edbe734d3dad56196c9c8
parent62d955fd435273dcd9fffed0c0d83bbe90006a0a
Merge branch 'sb/pull-rebase' into next

* 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