Merge branch 'sb/pull-rebase'
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:47:13 +0000 (21:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Jun 2009 04:47:13 +0000 (21:47 -0700)
commit12d4ffaa94c1379c307cdf489565531c5d6c94fd
tree2e6897478bb7449bcd0bcb58022ae71af112c3f1
parent451316d9bd9d117533cf32bb352bc370190075fc
parent62d955fd435273dcd9fffed0c0d83bbe90006a0a
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
git-pull.sh