Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
author
Junio C Hamano
<gitster@pobox.com>
Fri, 28 May 2010 23:59:42 +0000
(16:59 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 28 May 2010 23:59:42 +0000
(16:59 -0700)
* maint:
Makefile: reenable install with NO_CURL
completion: --set-upstream option for git-branch
get_cwd_relative(): do not misinterpret suffix as subdirectory
1
2
Makefile
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
d0b16c8
371276b
)
diff --cc
Makefile
index 07cab8f6a47d4e49fab4d4f68d6998b2e0fff74b,61ad6688a34a2957c074854ba1d1d914b529ea8c..d5d6565c86242a10e5f0c10365375d2b8ba990c4
---
1
/
Makefile
---
2
/
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