From 0551f6a8c88b739b0939e7135c4df8dd93ebf93f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 25 Aug 2008 00:33:33 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.6.0.1-90-g27a6e --- RelNotes-1.6.0.1.txt | 17 +++++++++++------ config.txt | 17 ++++++++++++----- git-config.html | 19 +++++++++++++------ git.html | 5 +++-- git.txt | 6 ++++-- 5 files changed, 43 insertions(+), 21 deletions(-) diff --git a/RelNotes-1.6.0.1.txt b/RelNotes-1.6.0.1.txt index bac117e89..49d7a1caf 100644 --- a/RelNotes-1.6.0.1.txt +++ b/RelNotes-1.6.0.1.txt @@ -4,6 +4,9 @@ GIT v1.6.0.1 Release Notes Fixes since v1.6.0 ------------------ +* "git diff --cc" did not honor content mangling specified by + gitattributes and core.autocrlf when reading from the work tree. + * "git diff --check" incorrectly detected new trailing blank lines when whitespace check was in effect. @@ -13,6 +16,8 @@ Fixes since v1.6.0 * "git format-patch" peeked before the beginning of a string when "format.headers" variable is empty (a misconfiguration). +* "git help help" did not work correctly. + * "git mailinfo" (hence "git am") was unhappy when MIME multipart message contained garbage after the finishing boundary. @@ -22,10 +27,10 @@ Fixes since v1.6.0 * "git merge" did not refresh the index correctly when a merge resulted in a fast-forward. -Contains other various documentation fixes. +* "git merge" did not resolve a truly trivial merges that can be done + without content level merges. --- -exec >/var/tmp/1 -O=v1.6.0-14-g3a634dc -echo O=$(git describe maint) -git shortlog --no-merges $O..maint +* "git svn dcommit" to a repository with URL that has embedded usernames + did not work correctly. + +Contains other various documentation fixes. diff --git a/config.txt b/config.txt index 902067586..af57d9430 100644 --- a/config.txt +++ b/config.txt @@ -358,8 +358,13 @@ core.editor:: `EDITOR` environment variables and then finally `vi`. core.pager:: - The command that git will use to paginate output. Can be overridden - with the `GIT_PAGER` environment variable. + The command that git will use to paginate output. Can + be overridden with the `GIT_PAGER` environment + variable. Note that git sets the `LESS` environment + variable to `FRSX` if it is unset when it runs the + pager. One can change these settings by setting the + `LESS` variable to some other value or by giving the + `core.pager` option a value such as "`less -+FRSX`". core.whitespace:: A comma separated list of common whitespace problems to @@ -983,9 +988,11 @@ pack.packSizeLimit:: linkgit:git-repack[1]. pager.:: - Allows to set your own pager preferences for each command, overriding - the default. If `\--pager` or `\--no-pager` is specified on the command - line, it takes precedence over this option. + Allows turning on or off pagination of the output of a + particular git subcommand when writing to a tty. If + `\--paginate` or `\--no-pager` is specified on the command line, + it takes precedence over this option. To disable pagination for + all commands, set `core.pager` or 'GIT_PAGER' to "`cat`". pull.octopus:: The default merge strategy to use when pulling multiple branches diff --git a/git-config.html b/git-config.html index 76fe6f171..a70c1a25c 100644 --- a/git-config.html +++ b/git-config.html @@ -1198,8 +1198,13 @@ core.pager

- The command that git will use to paginate output. Can be overridden - with the GIT_PAGER environment variable. + The command that git will use to paginate output. Can + be overridden with the GIT_PAGER environment + variable. Note that git sets the LESS environment + variable to FRSX if it is unset when it runs the + pager. One can change these settings by setting the + LESS variable to some other value or by giving the + core.pager option a value such as "less -+FRSX".

@@ -2397,9 +2402,11 @@ pager.<cmd>

- Allows to set your own pager preferences for each command, overriding - the default. If --pager or --no-pager is specified on the command - line, it takes precedence over this option. + Allows turning on or off pagination of the output of a + particular git subcommand when writing to a tty. If + --paginate or --no-pager is specified on the command line, + it takes precedence over this option. To disable pagination for + all commands, set core.pager or GIT_PAGER to "cat".

@@ -2719,7 +2726,7 @@ web.browser diff --git a/git.html b/git.html index b327e15b8..970f45701 100644 --- a/git.html +++ b/git.html @@ -1878,7 +1878,8 @@ parameter, <path>.

This environment variable overrides $PAGER. If it is set to an empty string or to the value "cat", git will not launch - a pager. + a pager. See also the core.pager option in + git-config(1).

@@ -2024,7 +2025,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 1bc295dd5..e178fb581 100644 --- a/git.txt +++ b/git.txt @@ -43,9 +43,10 @@ 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.0/git.html[documentation for release 1.6.0] +* link:v1.6.1/git.html[documentation for release 1.6.1] * release notes for + link:RelNotes-1.6.1.txt[1.6.1], link:RelNotes-1.6.0.txt[1.6.0]. * link:v1.5.6.5/git.html[documentation for release 1.5.6.5] @@ -497,7 +498,8 @@ other 'GIT_PAGER':: This environment variable overrides `$PAGER`. If it is set to an empty string or to the value "cat", git will not launch - a pager. + a pager. See also the `core.pager` option in + linkgit:git-config[1]. 'GIT_SSH':: If this environment variable is set then 'git-fetch' -- 2.26.2