Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Counto-fix in merge-recursive | Junio C Hamano | 2007-04-18 | 1 | -1/+4 | |
| * | | | | | Fix funny types used in attribute value representation | Junio C Hamano | 2007-04-18 | 6 | -26/+43 | |
| * | | | | | Allow low-level driver to specify different behaviour during internal merge. | Junio C Hamano | 2007-04-18 | 1 | -0/+12 | |
| * | | | | | Custom low-level merge driver: change the configuration scheme. | Junio C Hamano | 2007-04-18 | 2 | -79/+131 | |
| * | | | | | Allow the default low-level merge driver to be configured. | Junio C Hamano | 2007-04-18 | 1 | -2/+12 | |
| * | | | | | Custom low-level merge driver support. | Junio C Hamano | 2007-04-18 | 2 | -13/+235 | |
| * | | | | | Add a demonstration/test of customized merge. | Junio C Hamano | 2007-04-17 | 1 | -0/+72 | |
| * | | | | | Allow specifying specialized merge-backend per path. | Junio C Hamano | 2007-04-17 | 1 | -7/+129 | |
| * | | | | | merge-recursive: separate out xdl_merge() interface. | Junio C Hamano | 2007-04-17 | 1 | -21/+35 | |
| * | | | | | Allow more than true/false to attributes. | Junio C Hamano | 2007-04-17 | 5 | -82/+169 | |
| * | | | | | Document git-check-attr | James Bowes | 2007-04-15 | 2 | -0/+38 | |
| * | | | | | Change attribute negation marker from '!' to '-'. | Junio C Hamano | 2007-04-15 | 3 | -7/+52 | |
| * | | | | | Define a built-in attribute macro "binary". | Junio C Hamano | 2007-04-15 | 1 | -0/+1 | |
| * | | | | | attribute macro support | Junio C Hamano | 2007-04-15 | 2 | -48/+132 | |
| * | | | | | Makefile: add patch-ids.h back in. | Junio C Hamano | 2007-04-15 | 1 | -1/+1 | |
| * | | | | | Fix 'diff' attribute semantics. | Junio C Hamano | 2007-04-15 | 1 | -2/+3 | |
| * | | | | | Fix 'crlf' attribute semantics. | Junio C Hamano | 2007-04-15 | 1 | -44/+78 | |
| * | | | | | Teach 'diff' about 'diff' attribute. | Junio C Hamano | 2007-04-14 | 2 | -27/+31 | |
| * | | | | | Define 'crlf' attribute. | Junio C Hamano | 2007-04-14 | 3 | -7/+84 | |
| * | | | | | Add basic infrastructure to assign attributes to paths | Junio C Hamano | 2007-04-14 | 8 | -2/+453 | |
* | | | | | | Merge branch 'lt/gitlink' | Junio C Hamano | 2007-04-21 | 18 | -120/+639 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Tests for core subproject support | Alex Riesen | 2007-04-18 | 1 | -0/+85 | |
| * | | | | | | Expose subprojects as special files to "git diff" machinery | Linus Torvalds | 2007-04-15 | 1 | -0/+20 | |
| * | | | | | | Fix some "git ls-files -o" fallout from gitlinks | Linus Torvalds | 2007-04-14 | 1 | -7/+25 | |
| * | | | | | | Replace a pair of patches with updated ones for subproject support. | Junio C Hamano | 2007-04-14 | 0 | -0/+0 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Teach "git-read-tree -u" to check out submodules as a directory | Linus Torvalds | 2007-04-12 | 1 | -13/+29 | |
| | * | | | | | | Teach git list-objects logic not to follow gitlinks | Linus Torvalds | 2007-04-12 | 1 | -0/+34 | |
| * | | | | | | | Teach "git-read-tree -u" to check out submodules as a directory | Linus Torvalds | 2007-04-14 | 1 | -13/+32 | |
| * | | | | | | | Teach git list-objects logic to not follow gitlinks | Linus Torvalds | 2007-04-14 | 1 | -0/+34 | |
| * | | | | | | | Fix gitlink index entry filesystem matching | Linus Torvalds | 2007-04-14 | 1 | -4/+4 | |
| |/ / / / / / | ||||||
| * | | | | | | Don't show gitlink directories when we want "other" files | Linus Torvalds | 2007-04-12 | 1 | -0/+2 | |
| * | | | | | | Teach git-update-index about gitlinks | Linus Torvalds | 2007-04-12 | 1 | -62/+138 | |
| * | | | | | | Teach directory traversal about subprojects | Linus Torvalds | 2007-04-11 | 3 | -19/+121 | |
| * | | | | | | Fix thinko in subproject entry sorting | Linus Torvalds | 2007-04-11 | 1 | -2/+2 | |
| * | | | | | | Teach core object handling functions about gitlinks | Linus Torvalds | 2007-04-10 | 4 | -6/+54 | |
| * | | | | | | Teach "fsck" not to follow subproject links | Linus Torvalds | 2007-04-10 | 2 | -2/+22 | |
| * | | | | | | Add "S_IFDIRLNK" file mode infrastructure for git links | Linus Torvalds | 2007-04-10 | 1 | -1/+19 | |
| * | | | | | | Add 'resolve_gitlink_ref()' helper function | Linus Torvalds | 2007-04-10 | 2 | -0/+83 | |
| * | | | | | | Avoid overflowing name buffer in deep directory structures | Linus Torvalds | 2007-04-09 | 1 | -0/+3 | |
| * | | | | | | diff-lib: use ce_mode_from_stat() rather than messing with modes manually | Linus Torvalds | 2007-04-09 | 1 | -12/+3 | |
* | | | | | | | Merge branch 'np/pack' | Junio C Hamano | 2007-04-21 | 21 | -498/+1010 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | document --index-version for index-pack and pack-objects | Nicolas Pitre | 2007-04-19 | 2 | -0/+10 | |
| * | | | | | | | pack-objects: remove obsolete comments | Nicolas Pitre | 2007-04-19 | 1 | -11/+3 | |
| * | | | | | | | pack-objects: better check_object() performances | Nicolas Pitre | 2007-04-16 | 1 | -80/+126 | |
| * | | | | | | | add get_size_from_delta() | Nicolas Pitre | 2007-04-16 | 2 | -34/+40 | |
| * | | | | | | | pack-objects: make in_pack_header_size a variable of its own | Nicolas Pitre | 2007-04-16 | 1 | -14/+12 | |
| * | | | | | | | pack-objects: get rid of create_final_object_list() | Nicolas Pitre | 2007-04-16 | 1 | -55/+72 | |
| * | | | | | | | pack-objects: get rid of reuse_cached_pack | Nicolas Pitre | 2007-04-16 | 1 | -72/+14 | |
| * | | | | | | | pack-objects: clean up list sorting | Nicolas Pitre | 2007-04-16 | 1 | -31/+22 | |
| * | | | | | | | pack-objects: rework check_delta_limit usage | Nicolas Pitre | 2007-04-16 | 1 | -44/+32 |