summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
* | | | | | Merge branch 'lt/gitlink'Junio C Hamano2007-04-2118-120/+639
|\ \ \ \ \ \
| * | | | | | Tests for core subproject supportAlex Riesen2007-04-181-0/+85
| * | | | | | Expose subprojects as special files to "git diff" machineryLinus Torvalds2007-04-151-0/+20
| * | | | | | Fix some "git ls-files -o" fallout from gitlinksLinus Torvalds2007-04-141-7/+25
| * | | | | | Replace a pair of patches with updated ones for subproject support.Junio C Hamano2007-04-140-0/+0
| |\ \ \ \ \ \
| | * | | | | | Teach "git-read-tree -u" to check out submodules as a directoryLinus Torvalds2007-04-121-13/+29
| | * | | | | | Teach git list-objects logic not to follow gitlinksLinus Torvalds2007-04-121-0/+34
| * | | | | | | Teach "git-read-tree -u" to check out submodules as a directoryLinus Torvalds2007-04-141-13/+32
| * | | | | | | Teach git list-objects logic to not follow gitlinksLinus Torvalds2007-04-141-0/+34
| * | | | | | | Fix gitlink index entry filesystem matchingLinus Torvalds2007-04-141-4/+4
| |/ / / / / /
| * | | | | | Don't show gitlink directories when we want "other" filesLinus Torvalds2007-04-121-0/+2
| * | | | | | Teach git-update-index about gitlinksLinus Torvalds2007-04-121-62/+138
| * | | | | | Teach directory traversal about subprojectsLinus Torvalds2007-04-113-19/+121
| * | | | | | Fix thinko in subproject entry sortingLinus Torvalds2007-04-111-2/+2
| * | | | | | Teach core object handling functions about gitlinksLinus Torvalds2007-04-104-6/+54
| * | | | | | Teach "fsck" not to follow subproject linksLinus Torvalds2007-04-102-2/+22
| * | | | | | Add "S_IFDIRLNK" file mode infrastructure for git linksLinus Torvalds2007-04-101-1/+19
| * | | | | | Add 'resolve_gitlink_ref()' helper functionLinus Torvalds2007-04-102-0/+83
| * | | | | | Avoid overflowing name buffer in deep directory structuresLinus Torvalds2007-04-091-0/+3
| * | | | | | diff-lib: use ce_mode_from_stat() rather than messing with modes manuallyLinus Torvalds2007-04-091-12/+3
* | | | | | | Merge branch 'np/pack'Junio C Hamano2007-04-2121-498/+1010
|\ \ \ \ \ \ \
| * | | | | | | document --index-version for index-pack and pack-objectsNicolas Pitre2007-04-192-0/+10
| * | | | | | | pack-objects: remove obsolete commentsNicolas Pitre2007-04-191-11/+3
| * | | | | | | pack-objects: better check_object() performancesNicolas Pitre2007-04-161-80/+126
| * | | | | | | add get_size_from_delta()Nicolas Pitre2007-04-162-34/+40
| * | | | | | | pack-objects: make in_pack_header_size a variable of its ownNicolas Pitre2007-04-161-14/+12
| * | | | | | | pack-objects: get rid of create_final_object_list()Nicolas Pitre2007-04-161-55/+72
| * | | | | | | pack-objects: get rid of reuse_cached_packNicolas Pitre2007-04-161-72/+14
| * | | | | | | pack-objects: clean up list sortingNicolas Pitre2007-04-161-31/+22
| * | | | | | | pack-objects: rework check_delta_limit usageNicolas Pitre2007-04-161-44/+32