From: Junio C Hamano <junkio@cox.net>
Date: Sun, 22 Apr 2007 00:38:00 +0000 (-0700)
Subject: Merge branch 'jc/attr'
X-Git-Tag: v1.5.2-rc0~18
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a2d7c6c62080b542007f9787342aa1e57b95f50c?hp=a2d7c6c62080b542007f9787342aa1e57b95f50c

Merge branch 'jc/attr'

* 'jc/attr': (28 commits)
lockfile: record the primary process.
convert.c: restructure the attribute checking part.
Fix bogus linked-list management for user defined merge drivers.
Simplify calling of CR/LF conversion routines
Document gitattributes(5)
Update 'crlf' attribute semantics.
Documentation: support manual section (5) - file formats.
Simplify code to find recursive merge driver.
Counto-fix in merge-recursive
Fix funny types used in attribute value representation
Allow low-level driver to specify different behaviour during internal merge.
Custom low-level merge driver: change the configuration scheme.
Allow the default low-level merge driver to be configured.
Custom low-level merge driver support.
Add a demonstration/test of customized merge.
Allow specifying specialized merge-backend per path.
merge-recursive: separate out xdl_merge() interface.
Allow more than true/false to attributes.
Document git-check-attr
Change attribute negation marker from '!' to '-'.
...
---