diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-12 17:20:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-12 17:25:29 -0700 |
| commit | 1293c95241531f7f17ddb58739c5c42da46fa78c (patch) | |
| tree | 938d9ba01f079d6e1294e3ae4abda8efb7dd90d7 | |
| parent | ede4caf6e3204f9d63758d6410d0f124b0caab32 (diff) | |
| parent | 97a7a82f199f165f85fe39a3c318b18c621e6335 (diff) | |
| download | git-1293c95241531f7f17ddb58739c5c42da46fa78c.tar.gz git-1293c95241531f7f17ddb58739c5c42da46fa78c.tar.xz | |
Sync with 1.6.0.2
| -rw-r--r-- | Documentation/git-web--browse.txt | 2 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 | ||||
| -rw-r--r-- | Documentation/gitattributes.txt | 2 | ||||
| -rw-r--r-- | Documentation/merge-config.txt | 2 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| -rw-r--r-- | Makefile | 4 |
6 files changed, 11 insertions, 6 deletions
diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt index 36afad8d4..7f7a45b2e 100644 --- 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 e178fb581..df420aeb3 100644 --- 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 75124d261..6f3551dc8 100644 --- 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 00277e061..c735788b0 100644 --- 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 156dc1373..6c7465c75 100755 --- 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=' ' @@ -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 |