Autogenerated manpages for v1.5.2-rc0-34-gda94

diff --git a/man5/gitattributes.5 b/man5/gitattributes.5
index 3e813403fd7b7b51309dcc0b2ff610c21f4a551f..65ea17cbc74de8c98854ca70ba5cdcc40526fad9 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" "04/23/2007" "Git 1.5.2.rc0.1.g2cc31" "Git Manual"
+.TH "GITATTRIBUTES" "5" "04/25/2007" "Git 1.5.2.rc0.34.gda94" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -33,9 +33,9 @@ Set to a value
 The path has the attribute with specified string value; this is specified by listing the name of the attribute followed by an equal sign = and its value in the attribute list.
 .TP
 Unspecified
-No glob pattern matches the path, and nothing says if the path has or does not have the attribute.
+No glob pattern matches the path, and nothing says if the path has or does not have the attribute, the attribute for the path is said to be Unspecified.
 
-When more than one glob pattern matches the path, a later line overrides an earlier line.
+When more than one glob pattern matches the path, a later line overrides an earlier line. This overriding is done per attribute.
 
 When deciding what attributes are assigned to a path, git consults $GIT_DIR/info/attributes file (which has the highest precedence), .gitattributes file in the same directory as the path in question, and its parent directories (the further the directory that contains .gitattributes is from the path in question, the lower its precedence).
 
@@ -115,7 +115,7 @@ Unspecified
 By default, this uses the same built\-in 3\-way merge driver as is the case the merge attribute is set. However, merge.default configuration variable can name different merge driver to be used for paths to which the merge attribute is unspecified.
 .TP
 String
-3\-way merge is performed using the specified custom merge driver. The built\-in 3\-way merge driver can be explicitly specified by asking for "text" driver; the built\-in "take the current branch" driver can be requested by "binary".
+3\-way merge is performed using the specified custom merge driver. The built\-in 3\-way merge driver can be explicitly specified by asking for "text" driver; the built\-in "take the current branch" driver can be requested with "binary".
 .sp
 .it 1 an-trap
 .nr an-no-space-flag 1