Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 May 2010 23:59:42 +0000 (16:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 May 2010 23:59:42 +0000 (16:59 -0700)
commit81fa024cd8e336ba257f13fe7724b95baacfa3ad
tree69029df797195eb186535d82bbaadb8e7ed03712
parentd0b16c8f878bef5c1268e033a3d1f427498c7008
parent371276bf29314af04b804cfd877abcac62674a58
Merge branch 'maint'

* maint:
  Makefile: reenable install with NO_CURL
  completion: --set-upstream option for git-branch
  get_cwd_relative(): do not misinterpret suffix as subdirectory
Makefile