From 675570cc05eb839545ef80a812fddc2f33793955 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 13 Sep 2008 06:07:28 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0.2-229-g1293c --- git-config.html | 4 ++-- git-merge.html | 4 ++-- git-web--browse.html | 4 ++-- git-web--browse.txt | 2 +- git.html | 2 +- git.txt | 5 +++-- gitattributes.html | 4 ++-- gitattributes.txt | 2 +- merge-config.txt | 2 +- 9 files changed, 15 insertions(+), 14 deletions(-) diff --git a/git-config.html b/git-config.html index 61a001e3a..a64b28ddf 100644 --- a/git-config.html +++ b/git-config.html @@ -2162,7 +2162,7 @@ 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.

@@ -2744,7 +2744,7 @@ web.browser diff --git a/git-merge.html b/git-merge.html index 3ad4e2866..a9ad58d58 100644 --- a/git-merge.html +++ b/git-merge.html @@ -565,7 +565,7 @@ 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.

@@ -827,7 +827,7 @@ Look at the originals. git show :1:filename shows the diff --git a/git-web--browse.html b/git-web--browse.html index a1e2511e9..4d4907eb0 100644 --- a/git-web--browse.html +++ b/git-web--browse.html @@ -434,7 +434,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.

For consistency, we also try such a trick if browser.konqueror.path is @@ -476,7 +476,7 @@ git-list <git@vger.kernel.org>.

diff --git a/git-web--browse.txt b/git-web--browse.txt index 36afad8d4..7f7a45b2e 100644 --- a/git-web--browse.txt +++ b/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/git.html b/git.html index 970f45701..504182f18 100644 --- a/git.html +++ b/git.html @@ -2025,7 +2025,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index e178fb581..df420aeb3 100644 --- a/git.txt +++ b/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/gitattributes.html b/gitattributes.html index 01c7b26c4..30d3c5d67 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -643,7 +643,7 @@ patterns are available:

  • -java suitable for source code in the Java lanugage. +java suitable for source code in the Java language.

  • @@ -943,7 +943,7 @@ frotz unspecified diff --git a/gitattributes.txt b/gitattributes.txt index 75124d261..6f3551dc8 100644 --- a/gitattributes.txt +++ b/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/merge-config.txt b/merge-config.txt index 00277e061..c735788b0 100644 --- a/merge-config.txt +++ b/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:: -- 2.26.2