Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rr/fi-import-marks-if-exists' | Junio C Hamano | 2011-02-09 | 1 | -3/+13 |
|\ | |||||
| * | fast-import: Introduce --import-marks-if-exists | Ramkumar Ramachandra | 2011-01-18 | 1 | -3/+13 |
* | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2011-02-09 | 1 | -0/+2 |
|\ \ | |||||
| * | | fast-import: introduce "feature notes" command | Jonathan Nieder | 2011-02-09 | 1 | -0/+2 |
* | | | Merge branch 'maint' | Junio C Hamano | 2011-01-27 | 1 | -0/+6 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch 'jn/fast-import-empty-tree-removal' into maint | Junio C Hamano | 2011-01-27 | 1 | -0/+6 |
| |\ \ | |||||
| | * | | fast-import: treat filemodify with empty tree as delete | Jonathan Nieder | 2011-01-27 | 1 | -0/+6 |
| * | | | Merge branch 'jn/maint-fast-import-object-reuse' into maint | Junio C Hamano | 2011-01-19 | 1 | -7/+2 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'jn/fast-import-blob-access' | Junio C Hamano | 2010-12-16 | 1 | -9/+120 |
|\ \ \ \ \ | |||||
| * | | | | | fast-import: Allow cat-blob requests at arbitrary points in stream | Jonathan Nieder | 2010-12-01 | 1 | -12/+16 |
| * | | | | | fast-import: let importers retrieve blobs | David Barr | 2010-12-01 | 1 | -0/+97 |
| * | | | | | fast-import: stricter parsing of integer options | Jonathan Nieder | 2010-12-01 | 1 | -2/+11 |
* | | | | | | Merge branch 'jn/maint-fast-import-object-reuse' | Junio C Hamano | 2010-12-16 | 1 | -7/+2 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | fast-import: insert new object entries at start of hash bucket | David Barr | 2010-11-24 | 1 | -7/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'jn/fast-import-ondemand-checkpoint' | Junio C Hamano | 2010-12-16 | 1 | -1/+40 |
|\ \ \ \ \ | |||||
| * | | | | | fast-import: treat SIGUSR1 as a request to access objects early | Jonathan Nieder | 2010-11-24 | 1 | -1/+40 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jj/icase-directory' | Junio C Hamano | 2010-12-03 | 1 | -3/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Support case folding in git fast-import when core.ignorecase=true | Joshua Jensen | 2010-10-06 | 1 | -3/+4 |
* | | | | | | Merge branch 'jn/fast-import-fix' | Junio C Hamano | 2010-11-29 | 1 | -12/+37 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | fast-import: do not clear notes in do_change_note_fanout() | Jonathan Nieder | 2010-10-20 | 1 | -4/+1 |
| * | | | | | fast-import: tighten M 040000 syntax | Jonathan Nieder | 2010-10-18 | 1 | -9/+25 |
| * | | | | | fast-import: filemodify after M 040000 <tree> "" crashes | Jonathan Nieder | 2010-10-18 | 1 | -4/+16 |
* | | | | | | Sync with 1.7.3.2 | Junio C Hamano | 2010-10-21 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Use angles for placeholders consistently | Štěpán Němec | 2010-10-08 | 1 | -1/+1 |
* | | | | | fast-import: Allow filemodify to set the root | David Barr | 2010-10-13 | 1 | -0/+9 |
|/ / / / | |||||
* | | | | Merge branch 'en/d-f-conflict-fix' | Junio C Hamano | 2010-08-31 | 1 | -0/+8 |
|\ \ \ \ | |||||
| * | | | | fast-import: Improve robustness when D->F changes provided in wrong order | Elijah Newren | 2010-07-09 | 1 | -0/+8 |
* | | | | | Merge branch 'jn/fast-import-subtree' | Junio C Hamano | 2010-08-18 | 1 | -9/+15 |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Teach fast-import to import subtrees named by tree id | Jonathan Nieder | 2010-07-05 | 1 | -9/+15 |
* | | | | fast-import: export correctly marks larger than 2^20-1 | Raja R Harinath | 2010-08-11 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | enums: omit trailing comma for portability | Gary V. Vaughan | 2010-05-31 | 1 | -1/+1 |
| |/ / | |||||
* | | | fast-import: always create marks_file directories | Sverre Rabbelier | 2010-03-31 | 1 | -0/+2 |
|/ / | |||||
* | | refactor duplicated encode_header in pack-objects and fast-import | Michael Lukashov | 2010-02-17 | 1 | -26/+3 |
|/ | |||||
* | fast-import: use the diff_delta() max_delta_size argument | Nicolas Pitre | 2010-02-17 | 1 | -6/+2 |
* | fast-import: honor pack.indexversion and pack.packsizelimit config vars | Nicolas Pitre | 2010-02-17 | 1 | -0/+11 |
* | fast-import: make default pack size unlimited | Nicolas Pitre | 2010-02-17 | 1 | -6/+6 |
* | fast-import: use write_idx_file() instead of custom code | Nicolas Pitre | 2010-02-17 | 1 | -46/+17 |
* | fast-import: use sha1write() for pack data | Nicolas Pitre | 2010-02-17 | 1 | -10/+25 |
* | fast-import: start using struct pack_idx_entry | Nicolas Pitre | 2010-02-17 | 1 | -29/+28 |
* | fast-import: count --max-pack-size in bytes | Junio C Hamano | 2010-02-04 | 1 | -6/+11 |
* | fast-import.c: Fix big-file-threshold parsing bug | Junio C Hamano | 2010-02-04 | 1 | -1/+4 |
* | Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob | Junio C Hamano | 2010-02-01 | 1 | -18/+156 |
|\ | |||||
| * | fast-import: Stream very large blobs directly to pack | Shawn O. Pearce | 2010-02-01 | 1 | -19/+160 |
* | | Merge branch 'jh/notes' (early part) | Junio C Hamano | 2010-01-20 | 1 | -5/+129 |
|\ \ | |||||
| * | | fast-import: Proper notes tree manipulation | Johan Herland | 2009-12-07 | 1 | -5/+129 |
* | | | Merge branch 'maint' | Junio C Hamano | 2010-01-18 | 1 | -5/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'dp/maint-1.6.5-fast-import-non-commit-tag' into maint | Junio C Hamano | 2010-01-18 | 1 | -5/+5 |
| |\ \ | |||||
| | * | | fast-import: tag may point to any object type | Dmitry Potapov | 2010-01-14 | 1 | -5/+5 |
* | | | | Merge branch 'sr/gfi-options' | Junio C Hamano | 2010-01-17 | 1 | -86/+231 |
|\ \ \ \ | |/ / / |/| | | |