diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-04-21 17:38:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-21 17:38:00 -0700 |
| commit | a2d7c6c62080b542007f9787342aa1e57b95f50c (patch) | |
| tree | 22348e2f38132cd45dcf74cf0c02475d95dbce5b /.gitignore | |
| parent | afb5b6a24bd333d298d10acac731f1c127bbb82d (diff) | |
| parent | 5e635e396020cc08bc21a3e67c20c5294d6d13fd (diff) | |
| download | git-a2d7c6c62080b542007f9787342aa1e57b95f50c.tar.gz | |
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 '-'.
...
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index fa7ac93594..4dc0c395fa 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ git-blame git-branch git-bundle git-cat-file +git-check-attr git-check-ref-format git-checkout git-checkout-index |