Autogenerated manpages for v1.5.3-rc3-7-gd58e

diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1
index dec456864cc3349f03228fa781cecfd4b6aa3baf..6702dde7881b25d968f585bcdaaf4824639a789f 100644 (file)
--- a/man1/git-diff-files.1
+++ b/man1/git-diff-files.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\-FILES" "1" "07/19/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual"
+.TH "GIT\-DIFF\-FILES" "1" "07/26/2007" "Git 1.5.3.rc3.7.gd58e" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -21,6 +21,12 @@ Generate patch (see section on generating patches)
 \-u
 Synonym for "\-p".
 .TP
+\-U<n>
+Shorthand for "\-\-unified=<n>".
+.TP
+\-\-unified=<n>
+Generate diffs with <n> lines of context instead of the usual three. Implies "\-p".
+.TP
 \-\-raw
 Generate the raw format.
 .TP
@@ -176,12 +182,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
@@ -235,7 +244,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"
@@ -259,7 +271,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"
@@ -302,6 +317,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
@@ -329,6 +345,8 @@ index fabadb8,cc95eb0..4866510
         if (!initialized) {
                 initialized = 1;
                 for_each_ref(get_name);
+.ft
+
 .fi
 .TP 3
 1.

diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1
index ca97af8a4e6aa9e42211ab30332b2c1bbd641eda..379e0fe7d3c2d199b2b76400ecc07e1517f4f75b 100644 (file)
--- a/man1/git-diff-index.1
+++ b/man1/git-diff-index.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\-INDEX" "1" "07/19/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual"
+.TH "GIT\-DIFF\-INDEX" "1" "07/26/2007" "Git 1.5.3.rc3.7.gd58e" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -21,6 +21,12 @@ Generate patch (see section on generating patches)
 \-u
 Synonym for "\-p".
 .TP
+\-U<n>
+Shorthand for "\-\-unified=<n>".
+.TP
+\-\-unified=<n>
+Generate diffs with <n> lines of context instead of the usual three. Implies "\-p".
+.TP
 \-\-raw
 Generate the raw format.
 .TP
@@ -171,12 +177,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
@@ -230,7 +239,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"
@@ -254,7 +266,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"
@@ -297,6 +312,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
@@ -324,6 +340,8 @@ index fabadb8,cc95eb0..4866510
         if (!initialized) {
                 initialized = 1;
                 for_each_ref(get_name);
+.ft
+
 .fi
 .TP 3
 1.

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index 04684a7566b8dbcff4ecaf1bb3c388525242aa02..ee01873503faba456459a3ba081deb4075a7cbbd 100644 (file)
--- 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/25/2007" "Git 1.5.3.rc3" "Git Manual"
+.TH "GIT\-DIFF\-TREE" "1" "07/26/2007" "Git 1.5.3.rc3.7.gd58e" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -30,6 +30,12 @@ Generate patch (see section on generating patches)
 \-u
 Synonym for "\-p".
 .TP
+\-U<n>
+Shorthand for "\-\-unified=<n>".
+.TP
+\-\-unified=<n>
+Generate diffs with <n> lines of context instead of the usual three. Implies "\-p".
+.TP
 \-\-raw
 Generate the raw format.
 .TP

diff --git a/man1/git-diff.1 b/man1/git-diff.1
index f57f3acae7221b6b2e0dbea2f47c8cad7e47e3f1..8ffbe30e2b3ffbbe242e65b4f1abc5d3a7a419c9 100644 (file)
--- a/man1/git-diff.1
+++ b/man1/git-diff.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" "1" "07/19/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual"
+.TH "GIT\-DIFF" "1" "07/26/2007" "Git 1.5.3.rc3.7.gd58e" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -43,6 +43,12 @@ Generate patch (see section on generating patches)
 \-u
 Synonym for "\-p".
 .TP
+\-U<n>
+Shorthand for "\-\-unified=<n>".
+.TP
+\-\-unified=<n>
+Generate diffs with <n> lines of context instead of the usual three. Implies "\-p".
+.TP
 \-\-raw
 Generate the raw format.
 .TP
@@ -172,9 +178,12 @@ The <paths> parameters, when given, are used to limit the diff to the named path
 Various ways to check your working tree
 .sp
 .nf
+.ft C
 $ git diff            \fB(1)\fR
 $ git diff \-\-cached   \fB(2)\fR
 $ git diff HEAD       \fB(3)\fR
+.ft
+
 .fi
 .sp
 \fB1. \fRchanges in the working tree not yet staged for the next commit.
@@ -187,9 +196,12 @@ $ git diff HEAD       \fB(3)\fR
 Comparing with arbitrary commits
 .sp
 .nf
+.ft C
 $ git diff test            \fB(1)\fR
 $ git diff HEAD \-\- ./test  \fB(2)\fR
 $ git diff HEAD^ HEAD      \fB(3)\fR
+.ft
+
 .fi
 .sp
 \fB1. \fRinstead of using the tip of the current branch, compare with the tip of "test" branch.
@@ -202,9 +214,12 @@ $ git diff HEAD^ HEAD      \fB(3)\fR
 Limiting the diff output
 .sp
 .nf
+.ft C
 $ git diff \-\-diff\-filter=MRC            \fB(1)\fR
 $ git diff \-\-name\-status \-r             \fB(2)\fR
 $ git diff arch/i386 include/asm\-i386   \fB(3)\fR
+.ft
+
 .fi
 .sp
 \fB1. \fRshow only modification, rename and copy, but not addition nor deletion.
@@ -217,8 +232,11 @@ $ git diff arch/i386 include/asm\-i386   \fB(3)\fR
 Munging the diff output
 .sp
 .nf
+.ft C
 $ git diff \-\-find\-copies\-harder \-B \-C  \fB(1)\fR
 $ git diff \-R                          \fB(2)\fR
+.ft
+
 .fi
 .sp
 \fB1. \fRspend extra cycles to find renames, copies and complete rewrites (very expensive).

diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1
index f91e63c46b009016d87d25effe01ef2e8d549537..42be8bffaa659c7b2cb50628ace3e20cc0959dba 100644 (file)
--- a/man1/git-format-patch.1
+++ b/man1/git-format-patch.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\-FORMAT\-PATCH" "1" "07/19/2007" "Git 1.5.3.rc0.11.ge2b1a" "Git Manual"
+.TH "GIT\-FORMAT\-PATCH" "1" "07/26/2007" "Git 1.5.3.rc3.7.gd58e" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -41,6 +41,12 @@ Generate patch (see section on generating patches)
 \-u
 Synonym for "\-p".
 .TP
+\-U<n>
+Shorthand for "\-\-unified=<n>".
+.TP
+\-\-unified=<n>
+Generate diffs with <n> lines of context instead of the usual three. Implies "\-p".
+.TP
 \-\-raw
 Generate the raw format.
 .TP
@@ -213,10 +219,13 @@ Note that you would need to include the leading dot . if you want a filename lik
 You can specify extra mail header lines to be added to each message in the repository configuration. You can also specify new defaults for the subject prefix and file suffix.
 .sp
 .nf
+.ft C
 [format]
         headers = "Organization: git\-foo\\n"
         subjectprefix = CHANGE
         suffix = .txt
+.ft
+
 .fi
 .SH "EXAMPLES"
 .TP