From c6fcd9bf370f8fead26f32283baa0d2db82a7244 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 25 Jul 2007 08:53:35 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.3-rc3 --- man1/git-commit.1 | 5 ++++- man1/git-diff-tree.1 | 22 ++++++++++++++++++++-- man1/git-log.1 | 13 +++++++++++-- man1/git-rev-list.1 | 4 ++-- man1/git-show.1 | 13 +++++++++++-- 5 files changed, 48 insertions(+), 9 deletions(-) diff --git a/man1/git-commit.1 b/man1/git-commit.1 index 39af6c9c8..305ee1bfa 100644 --- a/man1/git-commit.1 +++ b/man1/git-commit.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\-COMMIT" "1" "07/20/2007" "Git 1.5.3.rc2.22.g69a9b" "Git Manual" +.TH "GIT\-COMMIT" "1" "07/25/2007" "Git 1.5.3.rc3" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -55,6 +55,9 @@ Override the author name used in the commit. Use A U Thor f \-m |\-\-message= Use the given as the commit message. .TP +\-t |\-\-template= +Use the contents of the given file as the initial version of the commit message. The editor is invoked and you can make subsequent changes. If a message is specified using the \-m or \-F options, this option has no effect. The template file may also be specified using the commit.template configuration variable. +.TP \-s|\-\-signoff Add Signed\-off\-by line at the end of the commit message. .TP diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index 488ad8a84..04684a756 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" "07/19/2007" "Git 1.5.3.rc1.16.g9d6f" "Git Manual" +.TH "GIT\-DIFF\-TREE" "1" "07/25/2007" "Git 1.5.3.rc3" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -182,7 +182,7 @@ By default, "git\-diff\-tree \-\-stdin" shows differences, either in machine\-re This flag causes "git\-diff\-tree \-\-stdin" to also show the commit message before the differences. .TP \-\-pretty[=\fI\fR] -Pretty print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When left out the format default to \fImedium\fR. +Pretty\-print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When omitted, the format defaults to \fImedium\fR. .TP \-\-abbrev\-commit Instead of showing the full 40\-byte hexadecimal commit object name, show only handful hexdigits prefix. Non default number of digits can be specified with "\-\-abbrev=" (which also modifies diff output, if it is displayed). @@ -308,8 +308,11 @@ The \fIformat:\fR format allows you to specify which information you want to sho E.g, \fIformat:"The author of %h was %an, %ar%nThe title was >>%s<<%n"\fR would show something like this: .sp .nf +.ft C The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing \-p for traditional diff input.<< +.ft + .fi The placeholders are: .RS @@ -427,6 +430,7 @@ torvalds@ppc970:~/git> git\-diff\-tree 5319e4...... which tells you that the last commit changed just one file (it's from this one: .sp .nf +.ft C commit 3c6f7ca19ad4043e9e72fa94106f352897e651a8 tree 5319e4d609cdd282069cc4dce33c1db559539b03 parent b4e628ea30d5ab3606119d2ea5caeab141d38df7 @@ -437,6 +441,8 @@ Make "git\-fsck\-objects" print out all the root commits it finds. Once I do the reference tracking, I'll also make it print out all the HEAD commits it finds, which is even more interesting. +.ft + .fi in case you care). .SH "OUTPUT FORMAT" @@ -459,12 +465,15 @@ compares the index and the files on the filesystem. An output line is formatted this way: .sp .nf +.ft C in\-place edit :100644 100644 bcd1234... 0123456... M file0 copy\-edit :100644 100644 abcd123... 1234567... C68 file1 file2 rename\-edit :100644 100644 abcd123... 1234567... R86 file1 file3 create :000000 100644 0000000... 1234567... A file4 delete :100644 000000 1234567... 0000000... D file5 unmerged :000000 000000 0000000... 0000000... U file6 +.ft + .fi That is, from the left to the right: .TP 3 @@ -518,7 +527,10 @@ an LF or a NUL when \fI\-z\fR option is used, to terminate the record. Example: .sp .nf +.ft C :100644 100644 5be4a4...... 000000...... M file.c +.ft + .fi When \-z option is not used, TAB, LF, and backslash characters in pathnames are represented as \\t, \\n, and \\\\, respectively. .SH "DIFF FORMAT FOR MERGES" @@ -542,7 +554,10 @@ single path, only for "dst" Example: .sp .nf +.ft C ::100644 100644 100644 fabadb8... cc95eb0... 4866510... MM describe.c +.ft + .fi Note that \fIcombined diff\fR lists only files which were modified from all parents. .SH "GENERATING PATCHES WITH \-P" @@ -585,6 +600,7 @@ The similarity index is the percentage of unchanged lines, and the dissimilarity git\-diff\-tree and git\-diff\-files can take \fI\-c\fR or \fI\-\-cc\fR option to produce \fIcombined diff\fR, which looks like this: .sp .nf +.ft C diff \-\-combined describe.c index fabadb8,cc95eb0..4866510 \-\-\- a/describe.c @@ -612,6 +628,8 @@ index fabadb8,cc95eb0..4866510 if (!initialized) { initialized = 1; for_each_ref(get_name); +.ft + .fi .TP 3 1. diff --git a/man1/git-log.1 b/man1/git-log.1 index e211062f0..b83b74d53 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" "07/19/2007" "Git 1.5.3.rc1.16.g9d6f" "Git Manual" +.TH "GIT\-LOG" "1" "07/25/2007" "Git 1.5.3.rc3" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -20,7 +20,7 @@ This manual page describes only the most frequently used options. .SH "OPTIONS" .TP \-\-pretty[=\fI\fR] -Pretty print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When left out the format default to \fImedium\fR. +Pretty\-print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When omitted, the format defaults to \fImedium\fR. .TP \-\-abbrev\-commit Instead of showing the full 40\-byte hexadecimal commit object name, show only handful hexdigits prefix. Non default number of digits can be specified with "\-\-abbrev=" (which also modifies diff output, if it is displayed). @@ -161,8 +161,11 @@ The \fIformat:\fR format allows you to specify which information you want to sho E.g, \fIformat:"The author of %h was %an, %ar%nThe title was >>%s<<%n"\fR would show something like this: .sp .nf +.ft C The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing \-p for traditional diff input.<< +.ft + .fi The placeholders are: .RS @@ -288,8 +291,11 @@ Although we encourage that the commit log messages are encoded in UTF\-8, both t git\-commit\-tree (hence, git\-commit which uses it) issues an warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in .git/config file, like this: .sp .nf +.ft C [i18n] commitencoding = ISO\-8859\-1 +.ft + .fi Commit objects created with the above setting record the value of i18n.commitencoding in its encoding header. This is to help other people who look at them later. Lack of this header implies that the commit log message is encoded in UTF\-8. .TP @@ -297,8 +303,11 @@ Commit objects created with the above setting record the value of i18n.commitenc git\-log, git\-show and friends looks at the encoding header of a commit object, and tries to re\-code the log message into UTF\-8 unless otherwise specified. You can specify the desired output encoding with i18n.logoutputencoding in .git/config file, like this: .sp .nf +.ft C [i18n] logoutputencoding = ISO\-8859\-1 +.ft + .fi If you do not have this configuration variable, the value of i18n.commitencoding is used instead. diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index c4bb30d92..285a4b6cd 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" "07/24/2007" "Git 1.5.3.rc2.37.g1cff" "Git Manual" +.TH "GIT\-REV\-LIST" "1" "07/25/2007" "Git 1.5.3.rc3" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -80,7 +80,7 @@ Another special notation is "\fI\fR\&...\fI\fR" which is usefu Using these options, \fBgit\-rev\-list\fR(1) will act similar to the more specialized family of commit log tools: \fBgit\-log\fR(1), \fBgit\-show\fR(1), and \fBgit\-whatchanged\fR(1) .TP \-\-pretty[=\fI\fR] -Pretty print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When left out the format default to \fImedium\fR. +Pretty\-print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When omitted, the format defaults to \fImedium\fR. .TP \-\-abbrev\-commit Instead of showing the full 40\-byte hexadecimal commit object name, show only handful hexdigits prefix. Non default number of digits can be specified with "\-\-abbrev=" (which also modifies diff output, if it is displayed). diff --git a/man1/git-show.1 b/man1/git-show.1 index 7da0d0ccc..ba5b5fd86 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" "07/19/2007" "Git 1.5.3.rc1.16.g9d6f" "Git Manual" +.TH "GIT\-SHOW" "1" "07/25/2007" "Git 1.5.3.rc3" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -31,7 +31,7 @@ This manual page describes only the most frequently used options. The name of the object to show. For a more complete list of ways to spell object names, see "SPECIFYING REVISIONS" section in \fBgit\-rev\-parse\fR(1). .TP \-\-pretty[=\fI\fR] -Pretty print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When left out the format default to \fImedium\fR. +Pretty\-print the contents of the commit logs in a given format, where \fI\fR can be one of \fIoneline\fR, \fIshort\fR, \fImedium\fR, \fIfull\fR, \fIfuller\fR, \fIemail\fR, \fIraw\fR and \fIformat:\fR. When omitted, the format defaults to \fImedium\fR. .TP \-\-abbrev\-commit Instead of showing the full 40\-byte hexadecimal commit object name, show only handful hexdigits prefix. Non default number of digits can be specified with "\-\-abbrev=" (which also modifies diff output, if it is displayed). @@ -145,8 +145,11 @@ The \fIformat:\fR format allows you to specify which information you want to sho E.g, \fIformat:"The author of %h was %an, %ar%nThe title was >>%s<<%n"\fR would show something like this: .sp .nf +.ft C The author of fe6e0ee was Junio C Hamano, 23 hours ago The title was >>t4119: test autocomputing \-p for traditional diff input.<< +.ft + .fi The placeholders are: .RS @@ -269,8 +272,11 @@ Although we encourage that the commit log messages are encoded in UTF\-8, both t git\-commit\-tree (hence, git\-commit which uses it) issues an warning if the commit log message given to it does not look like a valid UTF\-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to have i18n.commitencoding in .git/config file, like this: .sp .nf +.ft C [i18n] commitencoding = ISO\-8859\-1 +.ft + .fi Commit objects created with the above setting record the value of i18n.commitencoding in its encoding header. This is to help other people who look at them later. Lack of this header implies that the commit log message is encoded in UTF\-8. .TP @@ -278,8 +284,11 @@ Commit objects created with the above setting record the value of i18n.commitenc git\-log, git\-show and friends looks at the encoding header of a commit object, and tries to re\-code the log message into UTF\-8 unless otherwise specified. You can specify the desired output encoding with i18n.logoutputencoding in .git/config file, like this: .sp .nf +.ft C [i18n] logoutputencoding = ISO\-8859\-1 +.ft + .fi If you do not have this configuration variable, the value of i18n.commitencoding is used instead. -- 2.26.2