Skip to content

Commit c05ef93

Browse files
wincentgitster
authored andcommitted
Grammar fixes for gitattributes documentation
Tweak the "filter" section of the gitattributes documentation to add some missing articles and improve some word choices without changing the semantics of the section. Signed-off-by: Wincent Colaiuta <win@wincent.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 436e7a7 commit c05ef93

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

Documentation/gitattributes.txt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,22 +148,23 @@ with `$Id$` upon check-in.
148148
`filter`
149149
^^^^^^^^
150150

151-
A `filter` attribute can be set to a string value. This names
151+
A `filter` attribute can be set to a string value that names a
152152
filter driver specified in the configuration.
153153

154-
A filter driver consists of `clean` command and `smudge`
154+
A filter driver consists of a `clean` command and a `smudge`
155155
command, either of which can be left unspecified. Upon
156-
checkout, when `smudge` command is specified, the command is fed
157-
the blob object from its standard input, and its standard output
158-
is used to update the worktree file. Similarly, `clean` command
159-
is used to convert the contents of worktree file upon checkin.
156+
checkout, when the `smudge` command is specified, the command is
157+
fed the blob object from its standard input, and its standard
158+
output is used to update the worktree file. Similarly, the
159+
`clean` command is used to convert the contents of worktree file
160+
upon checkin.
160161

161-
Missing filter driver definition in the config is not an error
162+
A missing filter driver definition in the config is not an error
162163
but makes the filter a no-op passthru.
163164

164165
The content filtering is done to massage the content into a
165166
shape that is more convenient for the platform, filesystem, and
166-
the user to use. The keyword here is "more convenient" and not
167+
the user to use. The key phrase here is "more convenient" and not
167168
"turning something unusable into usable". In other words, the
168169
intent is that if someone unsets the filter driver definition,
169170
or does not have the appropriate filter program, the project

0 commit comments

Comments
 (0)