From d9e0e5dcd3332bdff4665cb25795d3aa30aa5487 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 14 Apr 2007 16:22:04 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.1.1-98-gedb4f --- config.txt | 23 ++++++++++++++++++++--- git-config.html | 35 +++++++++++++++++++++++++++++++---- git-diff-tree.html | 7 ++++++- git-log.html | 7 ++++++- git-rev-list.html | 25 ++++++++++++++++++++++++- git-rev-list.txt | 15 +++++++++++++++ git-show.html | 7 ++++++- pretty-formats.txt | 1 + 8 files changed, 109 insertions(+), 11 deletions(-) diff --git a/config.txt b/config.txt index cf1e04038..7e41ca6a0 100644 --- a/config.txt +++ b/config.txt @@ -117,6 +117,16 @@ core.fileMode:: the working copy are ignored; useful on broken filesystems like FAT. See gitlink:git-update-index[1]. True by default. +core.autocrlf:: + If true, makes git convert `CRLF` at the end of lines in text files to + `LF` when reading from the filesystem, and convert in reverse when + writing to the filesystem. The variable can be set to + 'input', in which case the conversion happens only while + reading from the filesystem but files are written out with + `LF` at the end of lines. Currently, which paths to consider + "text" (i.e. be subjected to the autocrlf mechanism) is + decided purely based on the contents. + core.symlinks:: If false, symbolic links are checked out as small plain files that contain the link text. gitlink:git-update-index[1] and @@ -401,13 +411,20 @@ gc.rerereunresolved:: The default is 15 days. See gitlink:git-rerere[1]. gitcvs.enabled:: - Whether the cvs pserver interface is enabled for this repository. + Whether the cvs server interface is enabled for this repository. See gitlink:git-cvsserver[1]. gitcvs.logfile:: - Path to a log file where the cvs pserver interface well... logs + Path to a log file where the cvs server interface well... logs various stuff. See gitlink:git-cvsserver[1]. +gitcvs.allbinary:: + If true, all files are sent to the client in mode '-kb'. This + causes the client to treat all files as binary files which suppresses + any newline munging it otherwise might do. A work-around for the + fact that there is no way yet to set single files to mode '-kb'. + See gitlink:git-cvsserver[1]. + http.sslVerify:: Whether to verify the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment @@ -445,7 +462,7 @@ http.lowSpeedLimit, http.lowSpeedTime:: http.noEPSV:: A boolean which disables using of EPSV ftp command by curl. - This can helpful with some "poor" ftp servers which doesn't + This can helpful with some "poor" ftp servers which don't support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV' environment variable. Default is false (curl will use EPSV). diff --git a/git-config.html b/git-config.html index 6e7dda147..c01792896 100644 --- a/git-config.html +++ b/git-config.html @@ -689,6 +689,21 @@ core.fileMode

+core.autocrlf +
+
+

+ If true, makes git convert CRLF at the end of lines in text files to + LF when reading from the filesystem, and convert in reverse when + writing to the filesystem. The variable can be set to + input, in which case the conversion happens only while + reading from the filesystem but files are written out with + LF at the end of lines. Currently, which paths to consider + "text" (i.e. be subjected to the autocrlf mechanism) is + decided purely based on the contents. +

+
+
core.symlinks
@@ -1141,7 +1156,7 @@ gitcvs.enabled

- Whether the cvs pserver interface is enabled for this repository. + Whether the cvs server interface is enabled for this repository. See git-cvsserver(1).

@@ -1150,11 +1165,23 @@ gitcvs.logfile

- Path to a log file where the cvs pserver interface well… logs + Path to a log file where the cvs server interface well… logs various stuff. See git-cvsserver(1).

+gitcvs.allbinary +
+
+

+ If true, all files are sent to the client in mode -kb. This + causes the client to treat all files as binary files which suppresses + any newline munging it otherwise might do. A work-around for the + fact that there is no way yet to set single files to mode -kb. + See git-cvsserver(1). +

+
+
http.sslVerify
@@ -1230,7 +1257,7 @@ http.noEPSV

A boolean which disables using of EPSV ftp command by curl. - This can helpful with some "poor" ftp servers which doesn't + This can helpful with some "poor" ftp servers which don't support EPSV mode. Can be overridden by the GIT_CURL_FTP_NO_EPSV environment variable. Default is false (curl will use EPSV).

@@ -1539,7 +1566,7 @@ transfer.unpackLimit diff --git a/git-diff-tree.html b/git-diff-tree.html index 0b60e0029..e3d8b6944 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1024,6 +1024,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%m: left, right or boundary mark +

    +
    • +
  • +

    %n: newline

    @@ -1463,7 +1468,7 @@ two unresolved merge parents with the working tree file diff --git a/git-log.html b/git-log.html index 4469a889c..dcf8cd684 100644 --- a/git-log.html +++ b/git-log.html @@ -559,6 +559,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%m: left, right or boundary mark +

    +
    • +
  • +

    %n: newline

    @@ -756,7 +761,7 @@ reversible operation.

    diff --git a/git-rev-list.html b/git-rev-list.html index 653d8bc52..68151655d 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -286,6 +286,7 @@ git-rev-list(1) Manual Page [ --topo-order ] [ --parents ] [ --left-right ] + [ --cherry-pick ] [ --encoding[=<encoding>] ] [ --(author|committer|grep)=<pattern> ] [ [--objects | --objects-edge] [ --unpacked ] ] @@ -613,6 +614,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%m: left, right or boundary mark +

    +
    • +
  • +

    %n: newline

    @@ -842,6 +848,23 @@ limiting may be applied.

    • +--cherry-pick +
    +
    +

    + Omit any commit that introduces the same change as + another commit on the "other side" when the set of + commits are limited with symmetric difference.
    +For example, if you have two branches, A and B, a usual way +to list all commits on only one side of them is with +--left-right, like the example above in the description of +that option. It however shows the commits that were cherry-picked +from the other branch (for example, "3rd on b" may be cherry-picked +from branch A). With this option, such pairs of commits are +excluded from the output. +

    +
    +
    -g, --walk-reflogs
    @@ -1012,7 +1035,7 @@ and the git-list <git@vger.kernel.org>.

    diff --git a/git-rev-list.txt b/git-rev-list.txt index 12b71ed0b..77e068b15 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -22,6 +22,7 @@ SYNOPSIS [ \--topo-order ] [ \--parents ] [ \--left-right ] + [ \--cherry-pick ] [ \--encoding[=] ] [ \--(author|committer|grep)= ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] @@ -224,6 +225,20 @@ limiting may be applied. In addition to the '' listed on the command line, read them from the standard input. +--cherry-pick:: + + Omit any commit that introduces the same change as + another commit on the "other side" when the set of + commits are limited with symmetric difference. ++ +For example, if you have two branches, `A` and `B`, a usual way +to list all commits on only one side of them is with +`--left-right`, like the example above in the description of +that option. It however shows the commits that were cherry-picked +from the other branch (for example, "3rd on b" may be cherry-picked +from branch A). With this option, such pairs of commits are +excluded from the output. + -g, --walk-reflogs:: Instead of walking the commit ancestry chain, walk diff --git a/git-show.html b/git-show.html index 92a9f4048..89d00eb3b 100644 --- a/git-show.html +++ b/git-show.html @@ -574,6 +574,11 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

  • +%m: left, right or boundary mark +

    +
    • +
  • +

    %n: newline

    @@ -726,7 +731,7 @@ Johannes Schindelin <Johannes.Schindelin@gmx.de>.

    diff --git a/pretty-formats.txt b/pretty-formats.txt index 2fe6c3196..d7ffc21dd 100644 --- a/pretty-formats.txt +++ b/pretty-formats.txt @@ -117,6 +117,7 @@ The placeholders are: - '%Cgreen': switch color to green - '%Cblue': switch color to blue - '%Creset': reset color +- '%m': left, right or boundary mark - '%n': newline -- 2.26.2