From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 May 2010 23:59:42 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.2-rc0~100
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=81fa024cd8e336ba257f13fe7724b95baacfa3ad;p=git.git

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
---

81fa024cd8e336ba257f13fe7724b95baacfa3ad
diff --cc Makefile
index 07cab8f6a,61ad6688a..d5d6565c8
--- a/Makefile
+++ b/Makefile
@@@ -2013,12 -2002,9 +2014,12 @@@ endi
  		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
  		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
  		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
- 	  done; } && \
+ 	  done; } ; } && \
  	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"
  
 +install-gitweb:
 +	$(MAKE) -C gitweb install
 +
  install-doc:
  	$(MAKE) -C Documentation install