summaryrefslogtreecommitdiff
path: root/fast-import.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2011-03-161-28/+14
|\
| * standardize brace placement in struct definitionsJonathan Nieder2011-03-161-28/+14
* | Merge branch 'sp/maint-fd-limit'Junio C Hamano2011-03-151-0/+1
|\ \
| * | sha1_file.c: Don't retain open fds on small packsShawn O. Pearce2011-03-021-0/+1
| |/
* | fast-import: make code "-Wpointer-arith" cleanJonathan Nieder2011-02-281-1/+1
* | fast-import: add 'ls' commandDavid Barr2011-02-261-3/+159
* | Merge branch 'rr/fi-import-marks-if-exists'Junio C Hamano2011-02-091-3/+13
|\ \ | |/ |/|
| * fast-import: Introduce --import-marks-if-existsRamkumar Ramachandra2011-01-181-3/+13
* | Merge branch 'maint-1.7.0' into maintJunio C Hamano2011-02-091-0/+2
|\ \
| * | fast-import: introduce "feature notes" commandJonathan Nieder2011-02-091-0/+2
* | | Merge branch 'maint'Junio C Hamano2011-01-271-0/+6
|\ \ \ | |_|/ |/| |
| * | Merge branch 'jn/fast-import-empty-tree-removal' into maintJunio C Hamano2011-01-271-0/+6
| |\ \
| | * | fast-import: treat filemodify with empty tree as deleteJonathan Nieder2011-01-271-0/+6
| * | | Merge branch 'jn/maint-fast-import-object-reuse' into maintJunio C Hamano2011-01-191-7/+2
| |\ \ \
* | \ \ \ Merge branch 'jn/fast-import-blob-access'Junio C Hamano2010-12-161-9/+120
|\ \ \ \ \
| * | | | | fast-import: Allow cat-blob requests at arbitrary points in streamJonathan Nieder2010-12-011-12/+16
| * | | | | fast-import: let importers retrieve blobsDavid Barr2010-12-011-0/+97
| * | | | | fast-import: stricter parsing of integer optionsJonathan Nieder2010-12-011-2/+11
* | | | | | Merge branch 'jn/maint-fast-import-object-reuse'Junio C Hamano2010-12-161-7/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | fast-import: insert new object entries at start of hash bucketDavid Barr2010-11-241-7/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jn/fast-import-ondemand-checkpoint'Junio C Hamano2010-12-161-1/+40
|\ \ \ \ \
| * | | | | fast-import: treat SIGUSR1 as a request to access objects earlyJonathan Nieder2010-11-241-1/+40
| | |/ / / | |/| | |
* | | | | Merge branch 'jj/icase-directory'Junio C Hamano2010-12-031-3/+4
|\ \ \ \ \
| * | | | | Support case folding in git fast-import when core.ignorecase=trueJoshua Jensen2010-10-061-3/+4
* | | | | | Merge branch 'jn/fast-import-fix'Junio C Hamano2010-11-291-12/+37
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fast-import: do not clear notes in do_change_note_fanout()Jonathan Nieder2010-10-201-4/+1
| * | | | | fast-import: tighten M 040000 syntaxJonathan Nieder2010-10-181-9/+25
| * | | | | fast-import: filemodify after M 040000 <tree> "" crashesJonathan Nieder2010-10-181-4/+16
* | | | | | Sync with 1.7.3.2Junio C Hamano2010-10-211-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Use angles for placeholders consistentlyŠtěpán Němec2010-10-081-1/+1
* | | | | fast-import: Allow filemodify to set the rootDavid Barr2010-10-131-0/+9
|/ / / /
* | | | Merge branch 'en/d-f-conflict-fix'Junio C Hamano2010-08-311-0/+8
|\ \ \ \
| * | | | fast-import: Improve robustness when D->F changes provided in wrong orderElijah Newren2010-07-091-0/+8
* | | | | Merge branch 'jn/fast-import-subtree'Junio C Hamano2010-08-181-9/+15
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Teach fast-import to import subtrees named by tree idJonathan Nieder2010-07-051-9/+15
* | | | fast-import: export correctly marks larger than 2^20-1Raja R Harinath2010-08-111-1/+1
|/ / /
* | | Merge branch 'gv/portable'Junio C Hamano2010-06-211-1/+1
|\ \ \
| * | | enums: omit trailing comma for portabilityGary V. Vaughan2010-05-311-1/+1
| |/ /
* | | fast-import: always create marks_file directoriesSverre Rabbelier2010-03-311-0/+2
|/ /
* | refactor duplicated encode_header in pack-objects and fast-importMichael Lukashov2010-02-171-26/+3
|/
* fast-import: use the diff_delta() max_delta_size argumentNicolas Pitre2010-02-171-6/+2
* fast-import: honor pack.indexversion and pack.packsizelimit config varsNicolas Pitre2010-02-171-0/+11
* fast-import: make default pack size unlimitedNicolas Pitre2010-02-171-6/+6
* fast-import: use write_idx_file() instead of custom codeNicolas Pitre2010-02-171-46/+17
* fast-import: use sha1write() for pack dataNicolas Pitre2010-02-171-10/+25
* fast-import: start using struct pack_idx_entryNicolas Pitre2010-02-171-29/+28
* fast-import: count --max-pack-size in bytesJunio C Hamano2010-02-041-6/+11
* fast-import.c: Fix big-file-threshold parsing bugJunio C Hamano2010-02-041-1/+4
* Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blobJunio C Hamano2010-02-011-18/+156
|\
| * fast-import: Stream very large blobs directly to packShawn O. Pearce2010-02-011-19/+160
View Lorry Controller Status