undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync with 1.6.0.2

Browse Source
This commit is contained in:
Junio C Hamano 2008-09-12 17:20:39 -07:00
commit 1293c95241
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-web--browse.txt
View File

@ -77,7 +77,7 @@ the URLs passed as arguments.
Note about konqueror 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 configuration variable, we launch 'kfmclient' to try to open the HTML
man page on an already opened konqueror in a new tab if possible. man page on an already opened konqueror in a new tab if possible.

5
Documentation/git.txt
View File

@ -43,10 +43,11 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository. branch of the `git.git` repository.
Documentation for older releases are available here: 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 * 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:RelNotes-1.6.0.txt[1.6.0].
* link:v1.5.6.5/git.html[documentation for release 1.5.6.5] * link:v1.5.6.5/git.html[documentation for release 1.5.6.5]

2
Documentation/gitattributes.txt
View File

@ -313,7 +313,7 @@ patterns are available:
- `html` suitable for HTML/XHTML documents. - `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. - `pascal` suitable for source code in the Pascal/Delphi language.

2
Documentation/merge-config.txt
View File

@ -1,5 +1,5 @@
merge.stat:: 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. at the end of the merge. True by default.
merge.log:: merge.log::

2
GIT-VERSION-GEN
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
GVF=GIT-VERSION-FILE GVF=GIT-VERSION-FILE
DEF_VER=v1.6.0.GIT DEF_VER=v1.6.0.2.GIT
LF=' LF='
' '

4
Makefile
View File

@ -688,6 +688,8 @@ ifeq ($(uname_S),FreeBSD)
BASIC_LDFLAGS += -L/usr/local/lib BASIC_LDFLAGS += -L/usr/local/lib
DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
THREADED_DELTA_SEARCH = YesPlease THREADED_DELTA_SEARCH = YesPlease
COMPAT_CFLAGS += -Icompat/regex
COMPAT_OBJS += compat/regex/regex.o
endif endif
ifeq ($(uname_S),OpenBSD) ifeq ($(uname_S),OpenBSD)
NO_STRCASESTR = YesPlease NO_STRCASESTR = YesPlease
@ -714,6 +716,8 @@ ifeq ($(uname_S),AIX)
INTERNAL_QSORT = UnfortunatelyYes INTERNAL_QSORT = UnfortunatelyYes
NEEDS_LIBICONV=YesPlease NEEDS_LIBICONV=YesPlease
BASIC_CFLAGS += -D_LARGE_FILES BASIC_CFLAGS += -D_LARGE_FILES
COMPAT_CFLAGS += -Icompat/regex
COMPAT_OBJS += compat/regex/regex.o
endif endif
ifeq ($(uname_S),GNU) ifeq ($(uname_S),GNU)
# GNU/Hurd # GNU/Hurd