{"thread":{"id":"15561","subject":"[PATCH] Clarified gitattributes documentation regarding custom hunk header.","startedAt":"2008-09-17T06:20:39Z","lastAt":"2008-09-17T06:20:39Z","messageCount":1,"participants":["Garry Dolley"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"90897","messageId":"1221632439-31797-1-git-send-email-gdolley@ucla.edu","threadId":"15561","inReplyTo":null,"subject":"[PATCH] Clarified gitattributes documentation regarding custom hunk header.","fromName":"Garry Dolley","fromEmail":"gdolley@ucla.edu","sentAt":"2008-09-17T06:20:39Z","receivedAt":"2008-09-17T06:20:39Z","isPatch":true,"sender":{"key":"gdolley@ucla.edu","avatar":"https://gravatar.com/avatar/b9ca98e2d5fd3a993ad695e8315f078b7ae364d2d1b637a6adecf8953a034dd2?d=mp&s=160"},"body":"From: Garry Dolley <gdolley@arpnetworks.com>\n\nThe only part of the hunk header that we can change is the \"TEXT\"\nportion.  Additionally, a few grammatical errors have been corrected.\n\nSigned-off-by: Garry Dolley <gdolley@ucla.edu>\n---\n Documentation/gitattributes.txt |   18 +++++++++---------\n 1 files changed, 9 insertions(+), 9 deletions(-)\n\ndiff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt\nindex 6f3551d..e848c94 100644\n--- a/Documentation/gitattributes.txt\n+++ b/Documentation/gitattributes.txt\n@@ -270,27 +270,27 @@ See linkgit:git[1] for details.\n Defining a custom hunk-header\n ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n \n-Each group of changes (called \"hunk\") in the textual diff output\n+Each group of changes (called a \"hunk\") in the textual diff output\n is prefixed with a line of the form:\n \n \t@@ -k,l +n,m @@ TEXT\n \n-The text is called 'hunk header', and by default a line that\n-begins with an alphabet, an underscore or a dollar sign is used,\n-which matches what GNU 'diff -p' output uses.  This default\n-selection however is not suited for some contents, and you can\n-use customized pattern to make a selection.\n+This is called a 'hunk header'.  The \"TEXT\" portion is by default a line\n+that begins with an alphabet, an underscore or a dollar sign; this\n+matches what GNU 'diff -p' output uses.  This default selection however\n+is not suited for some contents, and you can use a customized pattern\n+to make a selection.\n \n-First in .gitattributes, you would assign the `diff` attribute\n+First, in .gitattributes, you would assign the `diff` attribute\n for paths.\n \n ------------------------\n *.tex\tdiff=tex\n ------------------------\n \n-Then, you would define \"diff.tex.funcname\" configuration to\n+Then, you would define a \"diff.tex.funcname\" configuration to\n specify a regular expression that matches a line that you would\n-want to appear as the hunk header, like this:\n+want to appear as the hunk header \"TEXT\", like this:\n \n ------------------------\n [diff \"tex\"]\n-- \n1.6.0.1\n"}]}