Autogenerated manpages for v1.5.3-rc3-91-g5c75

diff --git a/man1/git-diff.1 b/man1/git-diff.1
index 62ab06717041eb57684d29283a0b7b625cc9f1f0..a340e17fccf46163b2b3da16cb5975b77103b24f 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/27/2007" "Git 1.5.3.rc3.13.g7ab3" "Git Manual"
+.TH "GIT\-DIFF" "1" "07/30/2007" "Git 1.5.3.rc3.91.g5c75" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -216,7 +216,7 @@ Limiting the diff output
 .nf
 .ft C
 $ git diff \-\-diff\-filter=MRC            \fB(1)\fR
-$ git diff \-\-name\-status \-r             \fB(2)\fR
+$ git diff \-\-name\-status                \fB(2)\fR
 $ git diff arch/i386 include/asm\-i386   \fB(3)\fR
 .ft
 
@@ -224,7 +224,7 @@ $ git diff arch/i386 include/asm\-i386   \fB(3)\fR
 .sp
 \fB1. \fRshow only modification, rename and copy, but not addition nor deletion.
 .br
-\fB2. \fRshow only names and the nature of change, but not actual diff output. \-\-name\-status disables usual patch generation which in turn also disables recursive behavior, so without \-r you would only see the directory name if there is a change in a file in a subdirectory.
+\fB2. \fRshow only names and the nature of change, but not actual diff output.
 .br
 \fB3. \fRlimit diff output to named subtrees.
 .br

diff --git a/man5/gitattributes.5 b/man5/gitattributes.5
index 8c04a642ee3d62c93a9bf865230a326c77797c0e..2bf95d2196ac1e2c60ff7b0c29f524edc4c599d1 100644 (file)
--- a/man5/gitattributes.5
+++ b/man5/gitattributes.5
@@ -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 "GITATTRIBUTES" "5" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual"
+.TH "GITATTRIBUTES" "5" "07/30/2007" "Git 1.5.3.rc3.91.g5c75" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -265,7 +265,7 @@ By examining t/.gitattributes (which is in the same diretory as the path in ques
 Then it examines .gitattributes (which is in the parent directory), and finds that the first line matches, but t/.gitattributes file already decided how merge, foo and bar attributes should be given to this path, so it leaves foo and bar unset. Attribute baz is set.
 .TP
 3.
-Finally it examines $GIT_DIR/info/gitattributes. This file is used to override the in\-tree settings. The first line is a match, and foo is set, bar is reverted to unspecified state, and baz is unset.
+Finally it examines $GIT_DIR/info/attributes. This file is used to override the in\-tree settings. The first line is a match, and foo is set, bar is reverted to unspecified state, and baz is unset.
 
 As the result, the attributes assignement to t/abc becomes:
 .sp