From: Junio C Hamano Date: Sat, 13 Sep 2008 00:20:39 +0000 (-0700) Subject: Sync with 1.6.0.2 X-Git-Tag: v1.6.1-rc1~243 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1293c95241531f7f17ddb58739c5c42da46fa78c;p=git.git Sync with 1.6.0.2 --- 1293c95241531f7f17ddb58739c5c42da46fa78c diff --cc Documentation/gitattributes.txt index 75124d261,94e6752aa..6f3551dc8 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@@ -311,9 -311,7 +311,9 @@@ patterns are available - `bibtex` suitable for files with BibTeX coded references. +- `html` suitable for HTML/XHTML documents. + - - `java` suitable for source code in the Java lanugage. + - `java` suitable for source code in the Java language. - `pascal` suitable for source code in the Pascal/Delphi language. diff --cc Makefile index 247cd2dc3,8d8109576..3c0664a07 --- a/Makefile +++ b/Makefile @@@ -687,7 -677,8 +687,9 @@@ ifeq ($(uname_S),FreeBSD BASIC_CFLAGS += -I/usr/local/include BASIC_LDFLAGS += -L/usr/local/lib DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease + THREADED_DELTA_SEARCH = YesPlease + COMPAT_CFLAGS += -Icompat/regex + COMPAT_OBJS += compat/regex/regex.o endif ifeq ($(uname_S),OpenBSD) NO_STRCASESTR = YesPlease