Sync with 1.6.0.2

diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt
index 36afad8d4e0d67a8d9dd33d3bc590789e9f6604d..7f7a45b2eaa3997cbf5a250fb78387e2a0959a11 100644 (file)
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@@ -77,7 +77,7 @@ the URLs passed as arguments.
 Note about konqueror
 --------------------
 
-When 'konqueror' is specified by the a command line option or a
+When 'konqueror' is specified by a command line option or a
 configuration variable, we launch 'kfmclient' to try to open the HTML
 man page on an already opened konqueror in a new tab if possible.
 

diff --git a/Documentation/git.txt b/Documentation/git.txt
index e178fb581323adaa5f490fb67732f98147ec460f..df420aeb331592192ab27d76af780c8c97a95e87 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,10 +43,11 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.6.1/git.html[documentation for release 1.6.1]
+* link:v1.6.0.2/git.html[documentation for release 1.6.0.2]
 
 * release notes for
-  link:RelNotes-1.6.1.txt[1.6.1],
+  link:RelNotes-1.6.0.2.txt[1.6.0.2],
+  link:RelNotes-1.6.0.1.txt[1.6.0.1],
   link:RelNotes-1.6.0.txt[1.6.0].
 
 * link:v1.5.6.5/git.html[documentation for release 1.5.6.5]

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 75124d26125f736b446b8e18826af3e444503edd..6f3551dc825a04628e7bcd133421093d89f01956 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -313,7 +313,7 @@ patterns are available:
 
 - `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 --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index 00277e061313974a4f8fdb9333608902c7ef653f..c735788b0f1c8efb0b250d4810be420be6c62f89 100644 (file)
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -1,5 +1,5 @@
 merge.stat::
-       Whether to print the diffstat between ORIG_HEAD and merge result
+       Whether to print the diffstat between ORIG_HEAD and the merge result
        at the end of the merge.  True by default.
 
 merge.log::

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 156dc137339c4184727d1916e49a5bdf8c674d68..6c7465c75865577a87260c7936cb286ab84c6db6 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.0.GIT
+DEF_VER=v1.6.0.2.GIT
 
 LF='
 '

diff --git a/Makefile b/Makefile
index 247cd2dc3098e088a06d7f7670b4e48dc5e686ee..3c0664a0734a156859ea204ae4b9b5979620c28c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -688,6 +688,8 @@ ifeq ($(uname_S),FreeBSD)
        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
@@ -714,6 +716,8 @@ ifeq ($(uname_S),AIX)
        INTERNAL_QSORT = UnfortunatelyYes
        NEEDS_LIBICONV=YesPlease
        BASIC_CFLAGS += -D_LARGE_FILES
+       COMPAT_CFLAGS += -Icompat/regex
+       COMPAT_OBJS += compat/regex/regex.o
 endif
 ifeq ($(uname_S),GNU)
        # GNU/Hurd