aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-30 20:31:39 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-30 20:31:39 -0700
commit7df437e56b5a2c5ec7140dd097b517563db4972c (patch)
treea006f20b481d811ccb4846534ef6394be5bc78a8 /Makefile
parentff1e8bfcd69e5e0ee1a3167e80ef75b611f72123 (diff)
parentbbb896d8e10f736bfda8f587c0009c358c9a8599 (diff)
downloadgit-7df437e56b5a2c5ec7140dd097b517563db4972c.tar.gz
git-7df437e56b5a2c5ec7140dd097b517563db4972c.tar.xz
Merge branch 'maint'
* maint: gitattributes: -crlf is not binary git-apply: Loosen "match_beginning" logic Fix example in git-name-rev documentation shell: do not play duplicated definition games to shrink the executable Fix use of hardlinks in "make install" pack-objects: Allow missing base objects when creating thin packs
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index bf400e64f..20f028fff 100644
--- a/Makefile
+++ b/Makefile
@@ -1379,7 +1379,7 @@ endif
{ $(RM) "$$execdir/git-add$X" && \
ln git-add$X "$$execdir/git-add$X" 2>/dev/null || \
cp git-add$X "$$execdir/git-add$X"; } && \
- { $(foreach p,$(filter-out git-add,$(BUILT_INS)), $(RM) "$$execdir/$p" && \
+ { $(foreach p,$(filter-out git-add$X,$(BUILT_INS)), $(RM) "$$execdir/$p" && \
ln "$$execdir/git-add$X" "$$execdir/$p" 2>/dev/null || \
ln -s "git-add$X" "$$execdir/$p" 2>/dev/null || \
cp "$$execdir/git-add$X" "$$execdir/$p" || exit;) } && \