Re: [PATCH] Grammar fixes for gitattributes documentation
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:50
Wincent Colaiuta [off-list ref] writes:
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 <redacted>
Thanks.
quoted hunk
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 20cf8ff..b01786b 100644--- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt@@ -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 which names a filter driver specified in the configuration.
Will we get the canned "which vs that" discussion on this change?
-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 +checkout, when the `smudge` command is specified, the command is fed -the blob object from its standard input, and its standard output +the blob object from its standard input, and its standard output -is used to update the worktree file. Similarly, `clean` command +is used to update the worktree file. Similarly, the `clean` command -is used to convert the contents of worktree file upon checkin. +is used to convert the contents of worktree file upon checkin.
I do appreciate the grammar fixes, but I needed to re-wrap and swap lines to see the real change. Especially, after this re-wrapping, the updated lines with missing "the" fixed still fit nicely below 70 columns and the right edge is not too ragged to be distractive even for people who read unformatted text. Could you please avoid this kind of unnecessary re-wrapping in the future patches?