{"thread":{"id":"18092","subject":"[PATCH 3/3] Documentation: minor grammatical fixes.","startedAt":"2009-03-02T06:42:44Z","lastAt":"2009-03-02T20:35:05Z","messageCount":2,"participants":["David J. Mellor","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"106709","messageId":"20090302163548.D6ECC17A49@sandstone.whistlingcat.com","threadId":"18092","inReplyTo":null,"subject":"[PATCH 3/3] Documentation: minor grammatical fixes.","fromName":"David J. Mellor","fromEmail":"dmellor@whistlingcat.com","sentAt":"2009-03-02T06:42:44Z","receivedAt":"2009-03-02T06:42:44Z","isPatch":true,"sender":{"key":"dmellor@whistlingcat.com","avatar":"https://gravatar.com/avatar/f21761ecb54023bce07527c3841f614f96a4a182b8b3e7cad4d836e4af4ebe9a?d=mp&s=160"},"body":"The final hunk in this patch corrects what appears to be a typo:\n\nof --> or\n\nSigned-off-by: David J. Mellor \n---\n Documentation/git-apply.txt | 26 +++++++++++++-------------\n 1 files changed, 13 insertions(+), 13 deletions(-)\n\ndiff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt\nindex 0566376..9e5baa2 100644\n--- a/Documentation/git-apply.txt\n+++ b/Documentation/git-apply.txt\n@@ -25,7 +25,7 @@ and a work tree.\n OPTIONS\n -------\n ...::\n-\tThe files to read patch from. '-' can be used to read\n+\tThe files to read the patch from. '-' can be used to read\n \tfrom the standard input.\n \n --stat::\n@@ -33,8 +33,8 @@ OPTIONS\n \tinput. Turns off \"apply\".\n \n --numstat::\n-\tSimilar to \\--stat, but shows number of added and\n-\tdeleted lines in decimal notation and pathname without\n+\tSimilar to \\--stat, but shows the number of added and\n+\tdeleted lines in decimal notation and the pathname without\n \tabbreviation, to make it more machine friendly. For\n \tbinary files, outputs two `-` instead of saying\n \t`0 0`. Turns off \"apply\".\n@@ -60,15 +60,15 @@ OPTIONS\n \tcauses the index file to be updated.\n \n --cached::\n-\tApply a patch without touching the working tree. Instead, take the\n-\tcached data, apply the patch, and store the result in the index,\n+\tApply a patch without touching the working tree. Instead take the\n+\tcached data, apply the patch, and store the result in the index\n \twithout using the working tree. This implies '--index'.\n \n --build-fake-ancestor=::\n \tNewer 'git-diff' output has embedded 'index information'\n \tfor each blob to help identify the original version that\n \tthe patch applies to. When this flag is given, and if\n-\tthe original versions of the blobs is available locally,\n+\tthe original versions of the blobs are available locally,\n \tbuilds a temporary index containing those blobs.\n +\n When a pure mode change is encountered (which has no index information),\n@@ -109,13 +109,13 @@ the information is read from the current index instead.\n \tapplying a diff generated with --unified=0. To bypass these\n \tchecks use '--unidiff-zero'.\n +\n-Note, for the reasons stated above usage of context-free patches are\n+Note, for the reasons stated above usage of context-free patches is\n discouraged.\n \n --apply::\n \tIf you use any of the options marked \"Turns off\n \t'apply'\" above, 'git-apply' reads and outputs the\n-\tinformation you asked without actually applying the\n+\trequested information without actually applying the\n \tpatch. Give this flag after those flags to also apply\n \tthe patch.\n \n@@ -124,7 +124,7 @@ discouraged.\n \tpatch. This can be used to extract the common part between\n \ttwo files by first running 'diff' on them and applying\n \tthe result with this option, which would apply the\n-\tdeletion part but not addition part.\n+\tdeletion part but not the addition part.\n \n --allow-binary-replacement::\n --binary::\n@@ -162,7 +162,7 @@ By default, the command outputs warning messages but applies the patch.\n When `git-apply` is used for statistics and not applying a\n patch, it defaults to `nowarn`.\n +\n-You can use different `` to control this\n+You can use different `` values to control this\n behavior:\n +\n * `nowarn` turns off the trailing whitespace warning.\n@@ -170,7 +170,7 @@ behavior:\n patch as-is (default).\n * `fix` outputs warnings for a few such errors, and applies the\n patch after fixing them (`strip` is a synonym --- the tool\n- used to consider only trailing whitespaces as errors, and the\n+ used to consider only trailing whitespace characters as errors, and the\n fix involved 'stripping' them, but modern gits do more).\n * `error` outputs warnings for a few such errors, and refuses\n to apply the patch.\n@@ -195,7 +195,7 @@ behavior:\n \tadjusting the hunk headers appropriately).\n \n --directory=::\n-\tPrepend to all filenames. If a \"-p\" argument was passed, too,\n+\tPrepend to all filenames. If a \"-p\" argument was also passed,\n \tit is applied before prepending the new root.\n +\n For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui.sh`\n@@ -221,7 +221,7 @@ ignored, i.e., they are not required to be up-to-date or clean and they\n are not updated.\n \n If --index is not specified, then the submodule commits in the patch\n-are ignored and only the absence of presence of the corresponding\n+are ignored and only the absence or presence of the corresponding\n subdirectory is checked and (if possible) updated.\n \n Author\n-- \n1.6.1.3\n"},{"id":"106724","messageId":"7vbpsjmznq.fsf@gitster.siamese.dyndns.org","threadId":"18092","inReplyTo":"20090302163548.D6ECC17A49@sandstone.whistlingcat.com","subject":"Re: [PATCH 3/3] Documentation: minor grammatical fixes.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-03-02T20:35:05Z","receivedAt":"2009-03-02T20:35:05Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.\n"}]}