git/Documentation/gitattributes.txt, branch v1.6.3

doc/gitattributes: clarify location of config text

2009-04-18T04:28:07Z

The gitattributes documentation has a section on the "diff" attribute, with subsections for each of the things you might want to configure in your diff config section (external diff, hunk headers, etc). The first such subsection specifically notes that the definition of the diff driver should go into $GIT_DIR/config, but subsequent sections do not. This location is implied if you are reading the documentation sequentially, but it is not uncommon for a new user to jump to (or be referred to) a specific section. For a new user who does not know git well enough to recognize the config syntax, it is not clear that those directives don't also go into the gitattributes file. This patch just mentions the config file in each subsection, similar to the way it is mentioned in the first. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'maint-1.6.1' into maint

2009-04-08T06:05:14Z

* maint-1.6.1: Documentation: clarify .gitattributes search git-checkout.txt: clarify that applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index

Merge branch 'maint-1.6.0' into maint-1.6.1

2009-04-08T05:51:14Z

* maint-1.6.0: Documentation: clarify .gitattributes search git-checkout.txt: clarify that applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index

Documentation: clarify .gitattributes search

2009-04-08T04:58:25Z

Use the term "toplevel of the work tree" in gitattributes.txt and gitignore.txt to define the limits of the search for those files. Signed-off-by: Jason Merrill Signed-off-by: Junio C Hamano

gitattributes.txt: Path matching rules are explained in gitignore.txt

2009-02-25T08:49:54Z

The rules how the patterns are matched against path names are the same for .gitattribute and .gitignore files. This also replace the notion "glob pattern" by "pattern" because gitignore.txt talks about "glob" only in some contexts where the pattern is mentioned. Signed-off-by: Johannes Sixt Signed-off-by: Junio C Hamano

Change the spelling of "wordregex".

2009-01-22T07:52:16Z

Use "wordRegex" for configuration variable names. Use "word_regex" for C language tokens. Signed-off-by: Boyd Stephen Smith Jr. Signed-off-by: Junio C Hamano

color-words: make regex configurable via attributes

2009-01-17T18:44:21Z

Make the --color-words splitting regular expression configurable via the diff driver's 'wordregex' attribute. The user can then set the driver on a file in .gitattributes. If a regex is given on the command line, it overrides the driver's setting. We also provide built-in regexes for the languages that already had funcname patterns, and add an appropriate diff driver entry for C/++. (The patterns are designed to run UTF-8 sequences into a single chunk to make sure they remain readable.) Signed-off-by: Thomas Rast Signed-off-by: Junio C Hamano

Documentation: New GUI configuration and command-line options.

2008-11-15T05:38:11Z

Add information on new git-gui and gitk command-line options, configuration variables, and the encoding attribute. Signed-off-by: Alexander Gavrilov Signed-off-by: Junio C Hamano

Merge branch 'jk/diff-convfilter-test-fix'

2008-11-13T05:50:41Z

* jk/diff-convfilter-test-fix: Avoid using non-portable `echo -n` in tests. add userdiff textconv tests document the diff driver textconv feature diff: add missing static declaration Conflicts: Documentation/gitattributes.txt

Merge branch 'maint'

2008-11-02T07:15:22Z

* maint: Start 1.6.0.4 cycle add instructions on how to send patches to the mailing list with Gmail Documentation/gitattributes: Add subsection header for each attribute git send-email: avoid leaking directory file descriptors. send-pack: do not send out single-level refs such as refs/stash fix overlapping memcpy in normalize_absolute_path pack-objects: avoid reading uninitalized data correct cache_entry allocation Conflicts: RelNotes