diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-31 03:31:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-31 03:31:39 (GMT) |
| commit | 7df437e56b5a2c5ec7140dd097b517563db4972c (patch) | |
| tree | a006f20b481d811ccb4846534ef6394be5bc78a8 /Makefile | |
| parent | ff1e8bfcd69e5e0ee1a3167e80ef75b611f72123 (diff) | |
| parent | bbb896d8e10f736bfda8f587c0009c358c9a8599 (diff) | |
| download | git-7df437e56b5a2c5ec7140dd097b517563db4972c.zip git-7df437e56b5a2c5ec7140dd097b517563db4972c.tar.gz git-7df437e56b5a2c5ec7140dd097b517563db4972c.tar.bz2 | |
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-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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;) } && \ |