Merge branch 'ap/branch-ref-display'
authorJunio C Hamano <junkio@cox.net>
Fri, 24 Nov 2006 11:43:46 +0000 (03:43 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 24 Nov 2006 11:43:46 +0000 (03:43 -0800)
commit5b6be4ccb5fe45fba7ab6b9c332ed96ca806693f
treebc49211263e7181eb51d368e20bf575313948d4b
parentf3307deeec4b75001f543b4e7ca5a51f79a30e63
parentbfcc921430423828233dadfe274802ae68900f6e
Merge branch 'ap/branch-ref-display'

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