提交 c882c01e 编写于 作者: G Garry Dolley 提交者: Junio C Hamano

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: NGarry Dolley <gdolley@ucla.edu>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 61aeeefd
...@@ -270,27 +270,27 @@ See linkgit:git[1] for details. ...@@ -270,27 +270,27 @@ See linkgit:git[1] for details.
Defining a custom hunk-header 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: is prefixed with a line of the form:
@@ -k,l +n,m @@ TEXT @@ -k,l +n,m @@ TEXT
The text is called 'hunk header', and by default a line that This is called a 'hunk header'. The "TEXT" portion is by default a line
begins with an alphabet, an underscore or a dollar sign is used, that begins with an alphabet, an underscore or a dollar sign; this
which matches what GNU 'diff -p' output uses. This default matches what GNU 'diff -p' output uses. This default selection however
selection however is not suited for some contents, and you can is not suited for some contents, and you can use a customized pattern
use customized pattern to make a selection. to make a selection.
First in .gitattributes, you would assign the `diff` attribute First, in .gitattributes, you would assign the `diff` attribute
for paths. for paths.
------------------------ ------------------------
*.tex diff=tex *.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 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"] [diff "tex"]
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册