Sync with 1.6.0.2

17 years ago · 1293c95241
6 changed files with 11 additions and 6 deletions
--- a/Documentation/git-web--browse.txt
+++ b/Documentation/git-web--browse.txt
@ -77,7 +77,7 @@ the URLs passed as arguments.
				@@ -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.

--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@ -43,10 +43,11 @@ unreleased) version of git, that is available from 'master'
				@@ -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]
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@ -313,7 +313,7 @@ patterns are available:
				@@ -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.

--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@ -1,5 +1,5 @@
				@@ -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::
--- a/2
+++ b/2
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 #!/bin/sh

 GVF=GIT-VERSION-FILE
-DEF_VER=v1.6.0.GIT
+DEF_VER=v1.6.0.2.GIT

 LF='
 '
--- a/4
+++ b/4
@ -688,6 +688,8 @@ ifeq ($(uname_S),FreeBSD)
				@@ -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)
				@@ -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