diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-09-19 06:27:02 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-09-19 06:27:02 +0000 |
commit | 5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2 (patch) | |
tree | 49768808843ba11106360e8ffe4e10f6e07d2b54 /gitattributes.txt | |
parent | 78ec2268aca28653157a72bbebe42069f2fc903f (diff) | |
download | git-htmldocs-5e4d8dee8bb242deb8fd16e7dcd74a0e7fb713d2.tar.gz |
Autogenerated HTML docs for v1.6.0.2-287-g3791f
Diffstat (limited to 'gitattributes.txt')
-rw-r--r-- | gitattributes.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index 6f3551dc8..e848c9439 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -270,27 +270,27 @@ See linkgit:git[1] for details. Defining a custom hunk-header ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Each group of changes (called "hunk") in the textual diff output +Each group of changes (called a "hunk") in the textual diff output is prefixed with a line of the form: @@ -k,l +n,m @@ TEXT -The text is called 'hunk header', and by default a line that -begins with an alphabet, an underscore or a dollar sign is used, -which matches what GNU 'diff -p' output uses. This default -selection however is not suited for some contents, and you can -use customized pattern to make a selection. +This is called a 'hunk header'. The "TEXT" portion is by default a line +that begins with an alphabet, an underscore or a dollar sign; this +matches what GNU 'diff -p' output uses. This default selection however +is not suited for some contents, and you can use a customized pattern +to make a selection. -First in .gitattributes, you would assign the `diff` attribute +First, in .gitattributes, you would assign the `diff` attribute for paths. ------------------------ *.tex diff=tex ------------------------ -Then, you would define "diff.tex.funcname" configuration to +Then, you would define a "diff.tex.funcname" configuration to specify a regular expression that matches a line that you would -want to appear as the hunk header, like this: +want to appear as the hunk header "TEXT", like this: ------------------------ [diff "tex"] |