Clarified gitattributes documentation regarding custom hunk header.
The only part of the hunk header that we can change is the "TEXT" portion. Additionally, a few grammatical errors have been corrected. Signed-off-by: Garry Dolley <gdolley@ucla.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Garry Dolley committed
Sep 16, 2008 at 23:20 UTC
c882c01ef9c5a82c1282fd1cb094bb8f97472d7d
1 file changed
+9
-9
Documentation/gitattributes.txt
+9
-9
@@ -270,27 +270,27 @@ See linkgit:git[1] for details.
270
Defining a custom hunk-header
271
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
272
273
-Each group of changes (called "hunk") in the textual diff output
273
+Each group of changes (called a "hunk") in the textual diff output
274
is prefixed with a line of the form:
275
276
@@ -k,l +n,m @@ TEXT
277
278
-The text is called 'hunk header', and by default a line that
279
-begins with an alphabet, an underscore or a dollar sign is used,
280
-which matches what GNU 'diff -p' output uses. This default
281
-selection however is not suited for some contents, and you can
282
-use customized pattern to make a selection.
278
+This is called a 'hunk header'. The "TEXT" portion is by default a line
279
+that begins with an alphabet, an underscore or a dollar sign; this
280
+matches what GNU 'diff -p' output uses. This default selection however
281
+is not suited for some contents, and you can use a customized pattern
282
+to make a selection.
283
284
-First in .gitattributes, you would assign the `diff` attribute
284
+First, in .gitattributes, you would assign the `diff` attribute
285
for paths.
286
287
------------------------
288
*.tex diff=tex
289
------------------------
290
291
-Then, you would define "diff.tex.funcname" configuration to
291
+Then, you would define a "diff.tex.funcname" configuration to
292
specify a regular expression that matches a line that you would
293
-want to appear as the hunk header, like this:
293
+want to appear as the hunk header "TEXT", like this:
294
295
------------------------
296
[diff "tex"]