Skip to content

Commit

Permalink
Grammar fixes for gitattributes documentation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wincent Colaiuta authored and Junio C Hamano committed Nov 14, 2007
1 parent 436e7a7 commit c05ef93
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions Documentation/gitattributes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -148,22 +148,23 @@ with `$Id$` upon check-in.
`filter`
^^^^^^^^

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

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

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

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

0 comments on commit c05ef93

Please sign in to comment.