summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* gitweb: Show "no difference" message for empty diffv1.5.2-rc0Martin Koegler2007-04-222-0/+7
* delay progress display when checking out filesNicolas Pitre2007-04-221-7/+2
* provide a facility for "delayed" progress reportingNicolas Pitre2007-04-222-0/+40
* make progress "title" part of the common progress interfaceNicolas Pitre2007-04-226-34/+27
* common progress display supportNicolas Pitre2007-04-227-185/+154
* Support 'diff=pgm' attributeJunio C Hamano2007-04-225-5/+182
* pack-objects: make generated packfile read-onlyJunio C Hamano2007-04-221-1/+1
* Update tests not to assume that generated packfiles are writable.Junio C Hamano2007-04-221-11/+11
* Fix 'quickfix' on pack-objects.Junio C Hamano2007-04-221-2/+14
* pack-objects: quickfix for permission modes.Junio C Hamano2007-04-221-0/+6
* Fix crash in t0020 (crlf conversion)Alex Riesen2007-04-221-2/+4
* Fix a typo in crlf conversion codeAlex Riesen2007-04-221-5/+5
* Cleanup variables in cat-fileShawn O. Pearce2007-04-221-12/+18
* Update draft release notes for v1.5.2Junio C Hamano2007-04-221-26/+51
* Documentation/Makefile: fix section (5) installationJunio C Hamano2007-04-222-2/+2
* Update documentation links to point at v1.5.1.2Junio C Hamano2007-04-211-1/+5
* Merge branch 'lt/objalloc'Junio C Hamano2007-04-218-59/+43
|\
| * Clean up object creation to use more common codeLinus Torvalds2007-04-168-43/+23
| * Use proper object allocators for unknown object nodes tooLinus Torvalds2007-04-163-20/+24
* | Merge branch 'jc/add'Junio C Hamano2007-04-211-1/+57
|\ \
| * | git-add -u: match the index with working tree.Junio C Hamano2007-04-201-1/+57
* | | Merge branch 'jc/attr'Junio C Hamano2007-04-2122-134/+1816
|\ \ \
| * | | lockfile: record the primary process.Junio C Hamano2007-04-212-1/+6
| * | | convert.c: restructure the attribute checking part.Junio C Hamano2007-04-211-20/+28
| * | | Fix bogus linked-list management for user defined merge drivers.Junio C Hamano2007-04-211-1/+2
| * | | Simplify calling of CR/LF conversion routinesAlex Riesen2007-04-206-60/+51
| * | | Document gitattributes(5)Junio C Hamano2007-04-193-2/+300
| * | | Update 'crlf' attribute semantics.Junio C Hamano2007-04-192-60/+89
| * | | Documentation: support manual section (5) - file formats.Junio C Hamano2007-04-192-7/+15
| * | | Simplify code to find recursive merge driver.Junio C Hamano2007-04-181-7/+2
| * | | Counto-fix in merge-recursiveJunio C Hamano2007-04-181-1/+4
| * | | Fix funny types used in attribute value representationJunio C Hamano2007-04-186-26/+43
| * | | Allow low-level driver to specify different behaviour during internal merge.Junio C Hamano2007-04-181-0/+12
| * | | Custom low-level merge driver: change the configuration scheme.Junio C Hamano2007-04-182-79/+131
| * | | Allow the default low-level merge driver to be configured.Junio C Hamano2007-04-181-2/+12
| * | | Custom low-level merge driver support.Junio C Hamano2007-04-182-13/+235
| * | | Add a demonstration/test of customized merge.Junio C Hamano2007-04-171-0/+72
| * | | Allow specifying specialized merge-backend per path.Junio C Hamano2007-04-171-7/+129
| * | | merge-recursive: separate out xdl_merge() interface.Junio C Hamano2007-04-171-21/+35
| * | | Allow more than true/false to attributes.Junio C Hamano2007-04-175-82/+169
| * | | Document git-check-attrJames Bowes2007-04-152-0/+38
| * | | Change attribute negation marker from '!' to '-'.Junio C Hamano2007-04-153-7/+52
| * | | Define a built-in attribute macro "binary".Junio C Hamano2007-04-151-0/+1
| * | | attribute macro supportJunio C Hamano2007-04-152-48/+132
| * | | Makefile: add patch-ids.h back in.Junio C Hamano2007-04-151-1/+1
| * | | Fix 'diff' attribute semantics.Junio C Hamano2007-04-151-2/+3
| * | | Fix 'crlf' attribute semantics.Junio C Hamano2007-04-151-44/+78
| * | | Teach 'diff' about 'diff' attribute.Junio C Hamano2007-04-142-27/+31
| * | | Define 'crlf' attribute.Junio C Hamano2007-04-143-7/+84
| * | | Add basic infrastructure to assign attributes to pathsJunio C Hamano2007-04-148-2/+453