From 1c4bf1d0bdfd61da65077f9d96205a140eda0d53 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 14 Apr 2007 16:22:06 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.1.1-98-gedb4f --- man1/git-config.1 | 14 ++++++++++---- man1/git-diff-tree.1 | 5 ++++- man1/git-log.1 | 5 ++++- man1/git-rev-list.1 | 9 ++++++++- man1/git-show.1 | 5 ++++- 5 files changed, 30 insertions(+), 8 deletions(-) diff --git a/man1/git-config.1 b/man1/git-config.1 index ae2dac81e..1e71b1473 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-CONFIG" "1" "04/04/2007" "" "" +.TH "GIT\-CONFIG" "1" "04/14/2007" "Git 1.5.1.1.98.gedb4f" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -256,6 +256,9 @@ Note that this list is non\-comprehensive and not necessarily complete. For comm core.fileMode If false, the executable bit differences between the index and the working copy are ignored; useful on broken filesystems like FAT. See \fBgit\-update\-index\fR(1). True by default. .TP +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 \fIinput\fR, 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. +.TP core.symlinks If false, symbolic links are checked out as small plain files that contain the link text. \fBgit\-update\-index\fR(1) and \fBgit\-add\fR(1) will not change the recorded type to regular file. Useful on filesystems like FAT that do not support symbolic links. True by default. .TP @@ -394,10 +397,13 @@ gc.rerereunresolved Records of conflicted merge you have not resolved are kept for this many days when git rerere gc is run. The default is 15 days. See \fBgit\-rerere\fR(1). .TP gitcvs.enabled -Whether the cvs pserver interface is enabled for this repository. See \fBgit\-cvsserver\fR(1). +Whether the cvs server interface is enabled for this repository. See \fBgit\-cvsserver\fR(1). .TP gitcvs.logfile -Path to a log file where the cvs pserver interface well\&... logs various stuff. See \fBgit\-cvsserver\fR(1). +Path to a log file where the cvs server interface well\&... logs various stuff. See \fBgit\-cvsserver\fR(1). +.TP +gitcvs.allbinary +If true, all files are sent to the client in mode \fI\-kb\fR. 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 \fI\-kb\fR. See \fBgit\-cvsserver\fR(1). .TP http.sslVerify Whether to verify the SSL certificate when fetching or pushing over HTTPS. Can be overridden by the \fIGIT_SSL_NO_VERIFY\fR environment variable. @@ -421,7 +427,7 @@ http.lowSpeedLimit, http.lowSpeedTime If the HTTP transfer speed is less than \fIhttp.lowSpeedLimit\fR for longer than \fIhttp.lowSpeedTime\fR seconds, the transfer is aborted. Can be overridden by the \fIGIT_HTTP_LOW_SPEED_LIMIT\fR and \fIGIT_HTTP_LOW_SPEED_TIME\fR environment variables. .TP http.noEPSV -A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which doesn't support EPSV mode. Can be overridden by the \fIGIT_CURL_FTP_NO_EPSV\fR environment variable. Default is false (curl will use EPSV). +A boolean which disables using of EPSV ftp command by curl. This can helpful with some "poor" ftp servers which don't support EPSV mode. Can be overridden by the \fIGIT_CURL_FTP_NO_EPSV\fR environment variable. Default is false (curl will use EPSV). .TP i18n.commitEncoding Character encoding the commit messages are stored in; git itself does not care per se, but this information is necessary e.g. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other porcelains). See e.g. \fBgit\-mailinfo\fR(1). Defaults to \fIutf\-8\fR. diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 865f26b87..39d0732e0 100644 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-tree.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-DIFF\-TREE" "1" "04/04/2007" "" "" +.TH "GIT\-DIFF\-TREE" "1" "04/14/2007" "Git 1.5.1.1.98.gedb4f" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -358,6 +358,9 @@ The placeholders are: \fI%Creset\fR: reset color .TP \(bu +\fI%m\fR: left, right or boundary mark +.TP +\(bu \fI%n\fR: newline .RS .TP diff --git a/man1/git-log.1 b/man1/git-log.1 index 1cdc52879..f7bc9b161 100644 --- a/man1/git-log.1 +++ b/man1/git-log.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-LOG" "1" "04/04/2007" "" "" +.TH "GIT\-LOG" "1" "04/14/2007" "Git 1.5.1.1.98.gedb4f" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -202,6 +202,9 @@ The placeholders are: \fI%Creset\fR: reset color .TP \(bu +\fI%m\fR: left, right or boundary mark +.TP +\(bu \fI%n\fR: newline .RS .TP diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index bb8bc0dee..f0f561a96 100644 --- a/man1/git-rev-list.1 +++ b/man1/git-rev-list.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-REV\-LIST" "1" "04/06/2007" "Git 1.5.1.53.g77e6f" "Git Manual" +.TH "GIT\-REV\-LIST" "1" "04/14/2007" "Git 1.5.1.1.98.gedb4f" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -25,6 +25,7 @@ git\-rev\-list \- Lists commit objects in reverse chronological order [ \-\-topo\-order ] [ \-\-parents ] [ \-\-left\-right ] + [ \-\-cherry\-pick ] [ \-\-encoding[=] ] [ \-\-(author|committer|grep)= ] [ [\-\-objects | \-\-objects\-edge] [ \-\-unpacked ] ] @@ -246,6 +247,9 @@ The placeholders are: \fI%Creset\fR: reset color .TP \(bu +\fI%m\fR: left, right or boundary mark +.TP +\(bu \fI%n\fR: newline .RS .TP @@ -339,6 +343,9 @@ Pretend as if all the refs in $GIT_DIR/refs/ are listed on the command line as \ \-\-stdin In addition to the \fI\fR listed on the command line, read them from the standard input. .TP +\-\-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. +.TP \-g, \-\-walk\-reflogs Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, \fI^commit\fR, \fIcommit1..commit2\fR, nor \fIcommit1\&...commit2\fR notations cannot be used). With \fI\-\-pretty\fR format other than oneline (for obvious reasons), this causes the output to have two extra lines of information used in the output. When the starting commit is specified as instead. Under \fI\-\-pretty=oneline\fR, the commit message is prefixed with this information on the same line. .TP diff --git a/man1/git-show.1 b/man1/git-show.1 index 059f671c8..c4c8f012e 100644 --- a/man1/git-show.1 +++ b/man1/git-show.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SHOW" "1" "04/04/2007" "" "" +.TH "GIT\-SHOW" "1" "04/14/2007" "Git 1.5.1.1.98.gedb4f" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -213,6 +213,9 @@ The placeholders are: \fI%Creset\fR: reset color .TP \(bu +\fI%m\fR: left, right or boundary mark +.TP +\(bu \fI%n\fR: newline .RS .TP -- 2.26.2