From: Junio C Hamano <junkio@cox.net>
Date: Fri, 24 Nov 2006 11:43:46 +0000 (-0800)
Subject: Merge branch 'ap/branch-ref-display'
X-Git-Tag: v1.5.0-rc0~233
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5b6be4ccb5fe45fba7ab6b9c332ed96ca806693f;p=git.git

Merge branch 'ap/branch-ref-display'

* ap/branch-ref-display:
  Add support to git-branch to show local and remote branches
---

5b6be4ccb5fe45fba7ab6b9c332ed96ca806693f