From: Junio C Hamano <junio@hera.kernel.org>
Date: Thu, 23 Nov 2006 02:47:44 +0000 (+0000)
Subject: Autogenerated man pages for v1.4.4.1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6692acbf3dbb6474deaa6db0a97698178d2f91d;p=git.git

Autogenerated man pages for v1.4.4.1
---

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index 9f907a838..850882c65 100755
--- 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" "10/27/2006" "" ""
+.TH "GIT\-DIFF\-TREE" "1" "11/23/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -162,8 +162,119 @@ flag.
 \-v
 This flag causes "git\-diff\-tree \-\-stdin" to also show the commit message before the differences.
 .TP
-\-\-pretty[=(raw|medium|short)]
-This is used to control "pretty printing" format of the commit message. Without "=<style>", it defaults to medium.
+\-\-pretty[=\fI<format>\fR]
+Pretty\-prints the details of a commit.
+\-\-pretty
+without an explicit
+=<format>
+defaults to
+\fImedium\fR. If the commit is a merge, and if the pretty\-format is not
+\fIoneline\fR,
+\fIemail\fR
+or
+\fIraw\fR, an additional line is inserted before the
+\fIAuthor:\fR
+line. This line begins with "Merge: " and the sha1s of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the
+\fBdirect\fR
+parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file. Here are some additional details for each format:
+.RS
+.TP 3
+\(bu
+\fIoneline\fR
+.sp
+.nf
+<sha1> <title line>
+.fi
+This is designed to be as compact as possible.
+.TP
+\(bu
+\fIshort\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.TP
+\(bu
+\fImedium\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+Date: <date>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIfull\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+Commit: <committer>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIfuller\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+AuthorDate: <date & time>
+Commit: <committer>
+CommitDate: <date & time>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIemail\fR
+.sp
+.nf
+From <sha1> <date>
+From: <author>
+Date: <date & time>
+Subject: [PATCH] <title line>
+.fi
+.sp
+.nf
+full commit message>
+.fi
+.TP
+\(bu
+\fIraw\fR
+.sp
+The
+\fIraw\fR
+format shows the entire commit exactly as stored in the commit object. Notably, the SHA1s are displayed in full, regardless of whether \-\-abbrev or \-\-no\-abbrev are used, and
+\fIparents\fR
+information show the true parent commits, without taking grafts nor history simplification into account.
+.RE
 .TP
 \-\-no\-commit\-id
 git\-diff\-tree outputs a line with the commit ID when applicable. This flag suppressed the commit ID output.
diff --git a/man1/git-log.1 b/man1/git-log.1
index 4f6ba23b9..1b8cfedfa 100755
--- 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" "10/03/2006" "" ""
+.TH "GIT\-LOG" "1" "11/23/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -21,8 +21,119 @@ This manual page describes only the most frequently used options.
 .sp
 .SH "OPTIONS"
 .TP
-\-\-pretty=<format>
-Controls the way the commit log is formatted.
+\-\-pretty[=\fI<format>\fR]
+Pretty\-prints the details of a commit.
+\-\-pretty
+without an explicit
+=<format>
+defaults to
+\fImedium\fR. If the commit is a merge, and if the pretty\-format is not
+\fIoneline\fR,
+\fIemail\fR
+or
+\fIraw\fR, an additional line is inserted before the
+\fIAuthor:\fR
+line. This line begins with "Merge: " and the sha1s of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the
+\fBdirect\fR
+parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file. Here are some additional details for each format:
+.RS
+.TP 3
+\(bu
+\fIoneline\fR
+.sp
+.nf
+<sha1> <title line>
+.fi
+This is designed to be as compact as possible.
+.TP
+\(bu
+\fIshort\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.TP
+\(bu
+\fImedium\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+Date: <date>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIfull\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+Commit: <committer>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIfuller\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+AuthorDate: <date & time>
+Commit: <committer>
+CommitDate: <date & time>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIemail\fR
+.sp
+.nf
+From <sha1> <date>
+From: <author>
+Date: <date & time>
+Subject: [PATCH] <title line>
+.fi
+.sp
+.nf
+full commit message>
+.fi
+.TP
+\(bu
+\fIraw\fR
+.sp
+The
+\fIraw\fR
+format shows the entire commit exactly as stored in the commit object. Notably, the SHA1s are displayed in full, regardless of whether \-\-abbrev or \-\-no\-abbrev are used, and
+\fIparents\fR
+information show the true parent commits, without taking grafts nor history simplification into account.
+.RE
 .TP
 \-\-max\-count=<n>
 Limits the number of commits to show.
diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1
index c70cf96d0..a55a6dd3b 100755
--- 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" "10/03/2006" "" ""
+.TH "GIT\-REV\-LIST" "1" "11/23/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -63,15 +63,118 @@ Using these options, \fBgit\-rev\-list\fR(1) will act similar to the more specia
 .sp
 .TP
 \-\-pretty[=\fI<format>\fR]
-Pretty print the contents of the commit logs in a given format, where
-\fI<format>\fR
-can be one of
-\fIraw\fR,
-\fImedium\fR,
-\fIshort\fR,
-\fIfull\fR, and
-\fIoneline\fR. When left out the format default to
-\fImedium\fR.
+Pretty\-prints the details of a commit.
+\-\-pretty
+without an explicit
+=<format>
+defaults to
+\fImedium\fR. If the commit is a merge, and if the pretty\-format is not
+\fIoneline\fR,
+\fIemail\fR
+or
+\fIraw\fR, an additional line is inserted before the
+\fIAuthor:\fR
+line. This line begins with "Merge: " and the sha1s of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the
+\fBdirect\fR
+parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file. Here are some additional details for each format:
+.RS
+.TP 3
+\(bu
+\fIoneline\fR
+.sp
+.nf
+<sha1> <title line>
+.fi
+This is designed to be as compact as possible.
+.TP
+\(bu
+\fIshort\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.TP
+\(bu
+\fImedium\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+Date: <date>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIfull\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+Commit: <committer>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIfuller\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+AuthorDate: <date & time>
+Commit: <committer>
+CommitDate: <date & time>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIemail\fR
+.sp
+.nf
+From <sha1> <date>
+From: <author>
+Date: <date & time>
+Subject: [PATCH] <title line>
+.fi
+.sp
+.nf
+full commit message>
+.fi
+.TP
+\(bu
+\fIraw\fR
+.sp
+The
+\fIraw\fR
+format shows the entire commit exactly as stored in the commit object. Notably, the SHA1s are displayed in full, regardless of whether \-\-abbrev or \-\-no\-abbrev are used, and
+\fIparents\fR
+information show the true parent commits, without taking grafts nor history simplification into account.
+.RE
 .TP
 \-\-relative\-date
 Show dates relative to the current time, e.g. "2 hours ago". Only takes effect for dates shown in human\-readable format, such as when using "\-\-pretty".
diff --git a/man1/git-show.1 b/man1/git-show.1
index 0c108da59..a7753b686 100755
--- 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" "10/03/2006" "" ""
+.TH "GIT\-SHOW" "1" "11/23/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -22,13 +22,119 @@ This manual page describes only the most frequently used options.
 <commitid>
 ID of the commit to show.
 .TP
-\-\-pretty=<format>
-Controls the output format for the commit logs. <format> can be one of
-\fIraw\fR,
-\fImedium\fR,
-\fIshort\fR,
-\fIfull\fR, and
-\fIoneline\fR.
+\-\-pretty[=\fI<format>\fR]
+Pretty\-prints the details of a commit.
+\-\-pretty
+without an explicit
+=<format>
+defaults to
+\fImedium\fR. If the commit is a merge, and if the pretty\-format is not
+\fIoneline\fR,
+\fIemail\fR
+or
+\fIraw\fR, an additional line is inserted before the
+\fIAuthor:\fR
+line. This line begins with "Merge: " and the sha1s of ancestral commits are printed, separated by spaces. Note that the listed commits may not necessarily be the list of the
+\fBdirect\fR
+parent commits if you have limited your view of history: for example, if you are only interested in changes related to a certain directory or file. Here are some additional details for each format:
+.RS
+.TP 3
+\(bu
+\fIoneline\fR
+.sp
+.nf
+<sha1> <title line>
+.fi
+This is designed to be as compact as possible.
+.TP
+\(bu
+\fIshort\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.TP
+\(bu
+\fImedium\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+Date: <date>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIfull\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+Commit: <committer>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIfuller\fR
+.sp
+.nf
+commit <sha1>
+Author: <author>
+AuthorDate: <date & time>
+Commit: <committer>
+CommitDate: <date & time>
+.fi
+.sp
+.nf
+<title line>
+.fi
+.sp
+.nf
+<full commit message>
+.fi
+.TP
+\(bu
+\fIemail\fR
+.sp
+.nf
+From <sha1> <date>
+From: <author>
+Date: <date & time>
+Subject: [PATCH] <title line>
+.fi
+.sp
+.nf
+full commit message>
+.fi
+.TP
+\(bu
+\fIraw\fR
+.sp
+The
+\fIraw\fR
+format shows the entire commit exactly as stored in the commit object. Notably, the SHA1s are displayed in full, regardless of whether \-\-abbrev or \-\-no\-abbrev are used, and
+\fIparents\fR
+information show the true parent commits, without taking grafts nor history simplification into account.
+.RE
 .SH "AUTHOR"
 Written by Linus Torvalds <torvalds@osdl.org> and Junio C Hamano <junkio@cox.net>
 .sp