--- a/lib/grit.rb
+++ b/lib/grit.rb
@@ -16,8 +16,7 @@ require 'open4'
 require 'grit/lazy'
 require 'grit/errors'
 require 'grit/git'
-require 'grit/head'
-require 'grit/tag'
+require 'grit/ref'
 require 'grit/commit'
 require 'grit/tree'
 require 'grit/blob'

--- a/lib/grit/head.rb
+++ /dev/null
@@ -1,92 +0,0 @@
-module Grit
-  HEAD_PREFIX = 'refs/heads'
-  
-  # A Head is a named reference to a Commit. Every Head instance contains a name
-  # and a Commit object.
-  #
-  #   r = Grit::Repo.new("/path/to/repo")
-  #   h = r.heads.first
-  #   h.name       # => "master"
-  #   h.commit     # => #<Grit::Commit "1c09f116cbc2cb4100fb6935bb162daa4723f455">
-  #   h.commit.id  # => "1c09f116cbc2cb4100fb6935bb162daa4723f455"
-  class Head
-    attr_reader :name
-    attr_reader :commit
-    
-    # Instantiate a new Head
-    #   +name+ is the name of the head
-    #   +commit+ is the Commit that the head points to
-    #
-    # Returns Grit::Head (baked)
-    def initialize(name, commit)
-      @name = name
-      @commit = commit
-    end
-    
-    # Find all Heads
-    #   +repo+ is the Repo
-    #   +options+ is a Hash of options
-    #
-    # Returns Grit::Head[] (baked)
-    def self.find_all(repo, options = {})
-      default_options = {:sort => "committerdate",
-                         :format => "%(refname)%00%(objectname)"}
-                         
-      actual_options = default_options.merge(options)
-      
-      output = repo.git.for_each_ref(actual_options, HEAD_PREFIX)
-                 
-      self.list_from_string(repo, output)
-    end
-
-   # Get the HEAD revision of the repo.
-    #   +repo+ is the Repo
-    #   +options+ is a Hash of options
-    #
-    # Returns Grit::Head (baked)
-    def self.current(repo, options = {})
-      head = File.open(File.join(repo.path, 'HEAD')).read.chomp
-      if /ref: refs\/heads\/(.*)/.match(head)
-        self.new($1, repo.git.rev_parse(options, 'HEAD'))
-      end
-    end
-
-    # Parse out head information into an array of baked head objects
-    #   +repo+ is the Repo
-    #   +text+ is the text output from the git command
-    #
-    # Returns Grit::Head[] (baked)
-    def self.list_from_string(repo, text)
-      heads = []
-      
-      text.split("\n").each do |line|
-        heads << self.from_string(repo, line)
-      end
-      
-      heads
-    end
-    
-    # Create a new Head instance from the given string.
-    #   +repo+ is the Repo
-    #   +line+ is the formatted head information
-    #
-    # Format
-    #   name: [a-zA-Z_/]+
-    #   <null byte>
-    #   id: [0-9A-Fa-f]{40}
-    #
-    # Returns Grit::Head (baked)
-    def self.from_string(repo, line)
-      full_name, id = line.split("\0")
-      name = full_name.sub("#{HEAD_PREFIX}/", '')
-      commit = Commit.create(repo, :id => id)
-      self.new(name, commit)
-    end
-    
-    # Pretty object inspection
-    def inspect
-      %Q{#<Grit::Head "#{@name}">}
-    end
-  end # Head
-  
-end # Grit

--- /dev/null
+++ b/lib/grit/ref.rb
@@ -0,0 +1,110 @@
+module Grit
+
+  class Ref
+
+    class << self
+
+      # Find all Refs
+      #   +repo+ is the Repo
+      #   +options+ is a Hash of options
+      #
+      # Returns Grit::Ref[] (baked)
+      def find_all(repo, options = {})
+        default_options = {:sort => "committerdate",
+                           :format => "%(refname)%00%(objectname)"}
+
+        actual_options = default_options.merge(options)
+
+        output = repo.git.for_each_ref(actual_options, prefix)
+
+        self.list_from_string(repo, output)
+      end
+
+      # Parse out ref information into an array of baked refs objects
+      #   +repo+ is the Repo
+      #   +text+ is the text output from the git command
+      #
+      # Returns Grit::Ref[] (baked)
+      def list_from_string(repo, text)
+        refs = []
+
+        text.split("\n").each do |line|
+          refs << self.from_string(repo, line)
+        end
+
+        refs.sort { | x, y | x.name <=> y.name }
+      end
+
+      # Create a new Ref instance from the given string.
+      #   +repo+ is the Repo
+      #   +line+ is the formatted head information
+      #
+      # Format
+      #   name: [a-zA-Z_/]+
+      #   <null byte>
+      #   id: [0-9A-Fa-f]{40}
+      #
+      # Returns Grit::Ref (baked)
+      def from_string(repo, line)
+        full_name, id = line.split("\0")
+        name = full_name.sub("#{prefix}/", '')
+        commit = Commit.create(repo, :id => id)
+        self.new(name, commit)
+      end
+
+      protected
+
+        def prefix
+          "refs/#{name.to_s.gsub(/^.*::/, '').downcase}s"
+        end
+
+    end
+
+    attr_reader :name
+    attr_reader :commit
+
+    # Instantiate a new Head
+    #   +name+ is the name of the head
+    #   +commit+ is the Commit that the head points to
+    #
+    # Returns Grit::Head (baked)
+    def initialize(name, commit)
+      @name = name
+      @commit = commit
+    end
+
+    # Pretty object inspection
+    def inspect
+      %Q{#<#{self.class.name} "#{@name}">}
+    end
+  end # Ref
+
+  # A Head is a named reference to a Commit. Every Head instance contains a name
+  # and a Commit object.
+  #
+  #   r = Grit::Repo.new("/path/to/repo")
+  #   h = r.heads.first
+  #   h.name       # => "master"
+  #   h.commit     # => #<Grit::Commit "1c09f116cbc2cb4100fb6935bb162daa4723f455">
+  #   h.commit.id  # => "1c09f116cbc2cb4100fb6935bb162daa4723f455"
+  class Head < Ref
+
+    # Get the HEAD revision of the repo.
+    #   +repo+ is the Repo
+    #   +options+ is a Hash of options
+    #
+    # Returns Grit::Head (baked)
+    def self.current(repo, options = {})
+      head = File.open(File.join(repo.path, 'HEAD')).read.chomp
+      if /ref: refs\/heads\/(.*)/.match(head)
+        self.new($1, repo.git.rev_parse(options, 'HEAD'))
+      end
+    end
+
+  end # Head
+
+  class Tag < Ref ; end
+
+  class Remote < Ref ; end
+
+end # Grit

--- a/lib/grit/repo.rb
+++ b/lib/grit/repo.rb
@@ -67,6 +67,22 @@ module Grit
       Tag.find_all(self)
     end
     
+    # An array of Remote objects representing the remote branches in
+    # this repo
+    #
+    # Returns Grit::Remote[] (baked)
+    def remotes
+      Remote.find_all(self)
+    end
+
+    # An array of Ref objects representing the refs in
+    # this repo
+    #
+    # Returns Grit::Ref[] (baked)
+    def refs
+      [ Head.find_all(self), Tag.find_all(self), Remote.find_all(self) ].flatten
+    end
+
     # An array of Commit objects representing the history of a given ref/commit
     #   +start+ is the branch/commit name (default 'master')
     #   +max_count+ is the maximum number of commits to return (default 10)

--- a/lib/grit/tag.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-module Grit
-  
-  class Tag
-    attr_reader :name
-    attr_reader :commit
-    
-    # Instantiate a new Tag
-    #   +name+ is the name of the head
-    #   +commit+ is the Commit that the head points to
-    #
-    # Returns Grit::Tag (baked)
-    def initialize(name, commit)
-      @name = name
-      @commit = commit
-    end
-    
-    # Find all Tags
-    #   +repo+ is the Repo
-    #   +options+ is a Hash of options
-    #
-    # Returns Grit::Tag[] (baked)
-    def self.find_all(repo, options = {})
-      default_options = {:sort => "committerdate",
-                         :format => "%(refname)%00%(objectname)"}
-                         
-      actual_options = default_options.merge(options)
-      
-      output = repo.git.for_each_ref(actual_options, "refs/tags")
-                 
-      self.list_from_string(repo, output)
-    end
-    
-    # Parse out tag information into an array of baked Tag objects
-    #   +repo+ is the Repo
-    #   +text+ is the text output from the git command
-    #
-    # Returns Grit::Tag[] (baked)
-    def self.list_from_string(repo, text)
-      tags = []
-      
-      text.split("\n").each do |line|
-        tags << self.from_string(repo, line)
-      end
-      
-      tags
-    end
-    
-    # Create a new Tag instance from the given string.
-    #   +repo+ is the Repo
-    #   +line+ is the formatted tag information
-    #
-    # Format
-    #   name: [a-zA-Z_/]+
-    #   <null byte>
-    #   id: [0-9A-Fa-f]{40}
-    #
-    # Returns Grit::Tag (baked)
-    def self.from_string(repo, line)
-      full_name, id = line.split("\0")
-      name = full_name.split("/").last
-      commit = Commit.create(repo, :id => id)
-      self.new(name, commit)
-    end
-    
-    # Pretty object inspection
-    def inspect
-      %Q{#<Grit::Tag "#{@name}">}
-    end
-  end # Tag
-  
-end # Grit
\ No newline at end of file

Binary files /dev/null and b/test/fixtures/for_each_ref_remotes differ

--- /dev/null
+++ b/test/test_remote.rb
@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestRemote < Test::Unit::TestCase
+  def setup
+    @r = Repo.new(GRIT_REPO)
+    Git.any_instance.expects(:for_each_ref).returns(fixture('for_each_ref_remotes'))
+  end
+
+  # inspect
+
+  def test_inspect
+    remote = @r.remotes.first
+    assert_equal %Q{#<Grit::Remote "#{remote.name}">}, remote.inspect
+  end
+end

--- a/test/test_repo.rb
+++ b/test/test_repo.rb
@@ -4,57 +4,65 @@ class TestRepo < Test::Unit::TestCase
   def setup
     @r = Repo.new(GRIT_REPO)
   end
-  
+
   # new
-  
+
   def test_new_should_raise_on_invalid_repo_location
     assert_raise(InvalidGitRepositoryError) do
       Repo.new("/tmp")
     end
   end
-  
+
   def test_new_should_raise_on_non_existant_path
     assert_raise(NoSuchPathError) do
       Repo.new("/foobar")
     end
   end
-  
+
   # descriptions
-  
+
   def test_description
     assert_equal "Unnamed repository; edit this file to name it for gitweb.", @r.description
   end
-  
+
+  # refs
+
+  def test_refs_should_return_array_of_ref_objects
+    @r.refs.each do |ref|
+      assert ref.is_a? Grit::Ref
+    end
+  end
+
   # heads
-  
+
   def test_heads_should_return_array_of_head_objects
     @r.heads.each do |head|
       assert_equal Grit::Head, head.class
     end
   end
-  
+
   def test_heads_should_populate_head_data
     Git.any_instance.expects(:for_each_ref).returns(fixture('for_each_ref'))
-    
+
     head = @r.heads.first
-    
+
     assert_equal 'master', head.name
     assert_equal '634396b2f541a9f2d58b00be1a07f0c358b999b3', head.commit.id
   end
-  
+
   # branches
-  
+
   def test_branches
     # same as heads
   end
-  
+
   # commits
-  
+
   def test_commits
     Git.any_instance.expects(:rev_list).returns(fixture('rev_list'))
-    
+
     commits = @r.commits('master', 10)
-    
+
     c = commits[0]
     assert_equal '4c8124ffcf4039d292442eeccabdeca5af5c5017', c.id
     assert_equal ["634396b2f541a9f2d58b00be1a07f0c358b999b3"], c.parents.map { |p| p.id }
@@ -66,190 +74,190 @@ class TestRepo < Test::Unit::TestCase
     assert_equal "tom@mojombo.com", c.committer.email
     assert_equal Time.at(1191999972), c.committed_date
     assert_equal "implement Grit#heads", c.message
-    
+
     c = commits[1]
     assert_equal [], c.parents
-    
+
     c = commits[2]
     assert_equal ["6e64c55896aabb9a7d8e9f8f296f426d21a78c2c", "7f874954efb9ba35210445be456c74e037ba6af2"], c.parents.map { |p| p.id }
     assert_equal "Merge branch 'site'\n\n  * Some other stuff\n  * just one more", c.message
     assert_equal "Merge branch 'site'", c.short_message
   end
-  
+
   # commit_count
-  
+
   def test_commit_count
     Git.any_instance.expects(:rev_list).with({}, 'master').returns(fixture('rev_list_count'))
-    
+
     assert_equal 655, @r.commit_count('master')
   end
-  
+
   # commit
-  
+
   def test_commit
     commit = @r.commit('634396b2f541a9f2d58b00be1a07f0c358b999b3')
-    
+
     assert_equal "634396b2f541a9f2d58b00be1a07f0c358b999b3", commit.id
   end
-  
+
   # tree
-  
+
   def test_tree
     Git.any_instance.expects(:ls_tree).returns(fixture('ls_tree_a'))
     tree = @r.tree('master')
-    
+
     assert_equal 4, tree.contents.select { |c| c.instance_of?(Blob) }.size
     assert_equal 3, tree.contents.select { |c| c.instance_of?(Tree) }.size
   end
-  
+
   # blob
-  
+
   def test_blob
     Git.any_instance.expects(:cat_file).returns(fixture('cat_file_blob'))
     blob = @r.blob("abc")
     assert_equal "Hello world", blob.data
   end
-  
+
   # init_bare
-  
+
   def test_init_bare
     Git.any_instance.expects(:init).returns(true)
     Repo.expects(:new).with("/foo/bar.git")
     Repo.init_bare("/foo/bar.git")
   end
-  
+
   def test_init_bare_with_options
     Git.any_instance.expects(:init).with(
       :template => "/baz/sweet").returns(true)
     Repo.expects(:new).with("/foo/bar.git")
     Repo.init_bare("/foo/bar.git", :template => "/baz/sweet")
   end
-  
+
   # fork_bare
-  
+
   def test_fork_bare
     Git.any_instance.expects(:clone).with(
-      {:bare => true, :shared => true}, 
+      {:bare => true, :shared => true},
       "#{absolute_project_path}/.git",
       "/foo/bar.git").returns(nil)
     Repo.expects(:new)
-      
+
     @r.fork_bare("/foo/bar.git")
   end
-  
+
   def test_fork_bare_with_options
     Git.any_instance.expects(:clone).with(
-      {:bare => true, :shared => true, :template => '/awesome'}, 
+      {:bare => true, :shared => true, :template => '/awesome'},
       "#{absolute_project_path}/.git",
       "/foo/bar.git").returns(nil)
     Repo.expects(:new)
-      
+
     @r.fork_bare("/foo/bar.git", :template => '/awesome')
   end
-  
+
   # diff
-  
+
   def test_diff
     Git.any_instance.expects(:diff).with({}, 'master^', 'master', '--')
     @r.diff('master^', 'master')
-    
+
     Git.any_instance.expects(:diff).with({}, 'master^', 'master', '--', 'foo/bar')
     @r.diff('master^', 'master', 'foo/bar')
-    
+
     Git.any_instance.expects(:diff).with({}, 'master^', 'master', '--', 'foo/bar', 'foo/baz')
     @r.diff('master^', 'master', 'foo/bar', 'foo/baz')
   end
-  
+
   # commit_diff
-  
+
   def test_diff
     Git.any_instance.expects(:diff).returns(fixture('diff_p'))
     diffs = @r.commit_diff('master')
-    
+
     assert_equal 15, diffs.size
   end
-  
+
   # init bare
-  
+
   # archive
-  
+
   def test_archive_tar
     @r.archive_tar
   end
-  
+
   # archive_tar_gz
-  
+
   def test_archive_tar_gz
     @r.archive_tar_gz
   end
-  
+
   # enable_daemon_serve
-  
+
   def test_enable_daemon_serve
     FileUtils.expects(:touch).with(File.join(@r.path, 'git-daemon-export-ok'))
     @r.enable_daemon_serve
   end
-  
+
   # disable_daemon_serve
-  
+
   def test_disable_daemon_serve
     FileUtils.expects(:rm_f).with(File.join(@r.path, 'git-daemon-export-ok'))
     @r.disable_daemon_serve
   end
-  
+
   # alternates
-  
+
   def test_alternates_with_two_alternates
     File.expects(:exist?).with("#{absolute_project_path}/.git/objects/info/alternates").returns(true)
     File.expects(:read).returns("/path/to/repo1/.git/objects\n/path/to/repo2.git/objects\n")
-    
+
     assert_equal ["/path/to/repo1/.git/objects", "/path/to/repo2.git/objects"], @r.alternates
   end
-  
+
   def test_alternates_no_file
     File.expects(:exist?).returns(false)
-    
+
     assert_equal [], @r.alternates
   end
-  
+
   # alternates=
-  
+
   def test_alternates_setter_ok
     alts = %w{/path/to/repo.git/objects /path/to/repo2.git/objects}
-    
+
     alts.each do |alt|
       File.expects(:exist?).with(alt).returns(true)
     end
-    
+
     File.any_instance.expects(:write).with(alts.join("\n"))
-    
+
     assert_nothing_raised do
       @r.alternates = alts
     end
   end
-  
+
   def test_alternates_setter_bad
     alts = %w{/path/to/repo.git/objects}
-    
+
     alts.each do |alt|
       File.expects(:exist?).with(alt).returns(false)
     end
-    
+
     File.any_instance.expects(:write).never
-    
+
     assert_raise RuntimeError do
       @r.alternates = alts
     end
   end
-  
+
   def test_alternates_setter_empty
     File.expects(:delete)
-    
+
     @r.alternates = []
   end
-  
+
   # inspect
-  
+
   def test_inspect
     assert_equal %Q{#<Grit::Repo "#{File.expand_path(GRIT_REPO)}/.git">}, @r.inspect
   end