Merge branch 'bs/maint-1.6.0-tree-walk-prefix'

[git.git] / Documentation / gitattributes.txt

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 8af22eccac85492416d36259baa60594c9b8382f..55668e345f9dd43f2f9850463503cda50f656641 100644 (file)
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -18,10 +18,10 @@ A `gitattributes` file is a simple text file that gives
 
 Each line in `gitattributes` file is of form:
 
 
 Each line in `gitattributes` file is of form:
 

-       glob    attr1 attr2 ...
+       pattern attr1 attr2 ...

 
 

-That is, a glob pattern followed by an attributes list,
-separated by whitespaces.  When the glob pattern matches the
+That is, a pattern followed by an attributes list,
+separated by whitespaces.  When the pattern matches the

 path in question, the attributes listed on the line are given to
 the path.
 
 path in question, the attributes listed on the line are given to
 the path.
 


@@ -48,13 +48,14 @@ Set to a value::
 
 Unspecified::
 
 
 Unspecified::
 

-       No glob pattern matches the path, and nothing says if
+       No pattern matches the path, and nothing says if

        the path has or does not have the attribute, the
        attribute for the path is said to be Unspecified.
 
        the path has or does not have the attribute, the
        attribute for the path is said to be Unspecified.
 

-When more than one glob pattern matches the path, a later line
+When more than one pattern matches the path, a later line

 overrides an earlier line.  This overriding is done per
 overrides an earlier line.  This overriding is done per

-attribute.
+attribute.  The rules how the pattern matches paths are the
+same as in `.gitignore` files; see linkgit:gitignore[5].

 
 When deciding what attributes are assigned to a path, git
 consults `$GIT_DIR/info/attributes` file (which has the highest
 
 When deciding what attributes are assigned to a path, git
 consults `$GIT_DIR/info/attributes` file (which has the highest


@@ -317,6 +318,8 @@ patterns are available:
 
 - `bibtex` suitable for files with BibTeX coded references.
 
 
 - `bibtex` suitable for files with BibTeX coded references.
 

+- `cpp` suitable for source code in the C and C++ languages.
+

 - `html` suitable for HTML/XHTML documents.
 
 - `java` suitable for source code in the Java language.
 - `html` suitable for HTML/XHTML documents.
 
 - `java` suitable for source code in the Java language.


@@ -334,6 +337,25 @@ patterns are available:
 - `tex` suitable for source code for LaTeX documents.
 
 
 - `tex` suitable for source code for LaTeX documents.
 
 

+Customizing word diff
+^^^^^^^^^^^^^^^^^^^^^
+
+You can customize the rules that `git diff --color-words` uses to
+split words in a line, by specifying an appropriate regular expression
+in the "diff.*.wordRegex" configuration variable.  For example, in TeX
+a backslash followed by a sequence of letters forms a command, but
+several such commands can be run together without intervening
+whitespace.  To separate them, use a regular expression such as
+
+------------------------
+[diff "tex"]
+       wordRegex = "\\\\[a-zA-Z]+|[{}]|\\\\.|[^\\{}[:space:]]+"
+------------------------
+
+A built-in pattern is provided for all languages listed in the
+previous section.
+
+

 Performing text diffs of binary files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Performing text diffs of binary files
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^