| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix sparse warnings | Stephen Boyd | 2011-03-22 | 1 | -1/+1 |
* | Revert "unpack_trees(): skip trees that are the same in all input" | Junio C Hamano | 2011-02-15 | 1 | -56/+0 |
* | Merge branch 'jc/unpack-trees' | Junio C Hamano | 2011-02-09 | 1 | -2/+62 |
|\ |
|
| * | unpack_trees(): skip trees that are the same in all input | Junio C Hamano | 2011-01-04 | 1 | -0/+56 |
| * | unpack-trees.c: cosmetic fix | Junio C Hamano | 2010-12-22 | 1 | -4/+8 |
* | | Merge branch 'jn/unpack-lstat-failure-report' | Junio C Hamano | 2011-02-09 | 1 | -6/+12 |
|\ \ |
|
| * | | unpack-trees: handle lstat failure for existing file | Jonathan Nieder | 2011-01-13 | 1 | -1/+3 |
| * | | unpack-trees: handle lstat failure for existing directory | Jonathan Nieder | 2011-01-13 | 1 | -5/+9 |
| * | | use persistent memory for rejected paths | Clemens Buchacher | 2010-12-14 | 1 | -25/+11 |
| * | | do not overwrite files in leading path | Clemens Buchacher | 2010-12-14 | 1 | -3/+13 |
| * | | add function check_ok_to_remove() | Clemens Buchacher | 2010-12-14 | 1 | -49/+58 |
* | | | Merge branch 'nd/maint-fix-add-typo-detection' | Junio C Hamano | 2010-12-22 | 1 | -23/+217 |
|\ \ \
| |_|/
|/| | |
|
| * | | unpack-trees: fix sparse checkout's "unable to match directories" | Nguyễn Thái Ngọc Duy | 2010-11-30 | 1 | -10/+144 |
| * | | unpack-trees: move all skip-worktree checks back to unpack_trees() | Nguyễn Thái Ngọc Duy | 2010-11-29 | 1 | -9/+73 |
| * | | dir.c: add free_excludes() | Nguyễn Thái Ngọc Duy | 2010-11-29 | 1 | -5/+1 |
| |/ |
|
* | | use persistent memory for rejected paths | Clemens Buchacher | 2010-11-15 | 1 | -25/+11 |
* | | do not overwrite files in leading path | Clemens Buchacher | 2010-10-13 | 1 | -3/+13 |
* | | add function check_ok_to_remove() | Clemens Buchacher | 2010-10-13 | 1 | -49/+58 |
|/ |
|
* | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-09-03 | 1 | -7/+49 |
|\ |
|
| * | Move "show_all_errors = 1" to setup_unpack_trees_porcelain() | Matthieu Moy | 2010-09-03 | 1 | -6/+2 |
| * | setup_unpack_trees_porcelain: take the whole options struct as parameter | Matthieu Moy | 2010-09-03 | 1 | -1/+3 |
| * | Move set_porcelain_error_msgs to unpack-trees.c and rename it | Matthieu Moy | 2010-09-03 | 1 | -1/+45 |
* | | Merge branch 'nd/fix-sparse-checkout' | Junio C Hamano | 2010-08-21 | 1 | -25/+31 |
|\ \ |
|
| * | | unpack-trees: mark new entries skip-worktree appropriately | Nguyễn Thái Ngọc Duy | 2010-08-09 | 1 | -0/+2 |
| * | | unpack-trees: do not check for conflict entries too early | Nguyễn Thái Ngọc Duy | 2010-08-09 | 1 | -4/+1 |
| * | | unpack-trees: let read-tree -u remove index entries outside sparse area | Nguyễn Thái Ngọc Duy | 2010-08-09 | 1 | -10/+19 |
| * | | unpack-trees: only clear CE_UPDATE|CE_REMOVE when skip-worktree is always set | Nguyễn Thái Ngọc Duy | 2010-08-09 | 1 | -14/+12 |
* | | | Merge branch 'dg/local-mod-error-messages' | Junio C Hamano | 2010-08-21 | 1 | -41/+124 |
|\ \ \
| | |/
| |/| |
|
| * | | unpack_trees: group error messages by type | Matthieu Moy | 2010-08-11 | 1 | -4/+74 |
| * | | merge-recursive: distinguish "removed" and "overwritten" messages | Matthieu Moy | 2010-08-11 | 1 | -25/+39 |
| * | | merge-recursive: porcelain messages for checkout | Diane Gasselin | 2010-08-11 | 1 | -3/+2 |
| * | | Turn unpack_trees_options.msgs into an array + enum | Matthieu Moy | 2010-08-11 | 1 | -21/+21 |
* | | | read-tree: stop leaking tree objects | Jonathan Nieder | 2010-08-11 | 1 | -1/+6 |
|/ / |
|
* | | Merge branch 'bd/maint-unpack-trees-parawalk-fix' | Junio C Hamano | 2010-06-22 | 1 | -2/+10 |
|\ \ |
|
| * | | unpack-trees: Make index lookahead less pessimal | Brian Downing | 2010-06-18 | 1 | -2/+10 |
| |/ |
|
* | | Merge branch 'gv/portable' | Junio C Hamano | 2010-06-21 | 1 | -1/+3 |
|\ \ |
|
| * | | Rewrite dynamic structure initializations to runtime assignment | Gary V. Vaughan | 2010-05-31 | 1 | -1/+3 |
| |/ |
|
* | | Merge branch 'cb/assume-unchanged-fix' | Junio C Hamano | 2010-06-13 | 1 | -1/+1 |
|\ \ |
|
| * | | do not overwrite files marked "assume unchanged" | Clemens Buchacher | 2010-05-01 | 1 | -1/+1 |
| |/ |
|
* | | Introduce remove_or_warn function | Peter Collingbourne | 2010-03-28 | 1 | -10/+2 |
|/ |
|
* | Merge branch 'jc/fix-tree-walk' | Junio C Hamano | 2010-01-24 | 1 | -58/+331 |
|\ |
|
| * | read-tree --debug-unpack | Junio C Hamano | 2010-01-07 | 1 | -0/+35 |
| * | unpack-trees.c: look ahead in the index | Junio C Hamano | 2010-01-07 | 1 | -3/+117 |
| * | unpack-trees.c: prepare for looking ahead in the index | Junio C Hamano | 2010-01-07 | 1 | -46/+170 |
| * | Aggressive three-way merge: fix D/F case | Junio C Hamano | 2010-01-03 | 1 | -5/+8 |
* | | Merge branch 'pc/uninteresting-submodule-disappear-upon-switch-branches' | Junio C Hamano | 2010-01-18 | 1 | -2/+10 |
|\ \ |
|
| * | | Remove empty directories when checking out a commit with fewer submodules | Peter Collingbourne | 2010-01-11 | 1 | -2/+10 |
| |/ |
|
* | | Merge branch 'cc/reset-more' | Junio C Hamano | 2010-01-13 | 1 | -7/+14 |
|\ \ |
|
| * | | "reset --merge": fix unmerged case | Junio C Hamano | 2010-01-03 | 1 | -7/+14 |
| |/ |
|
* | | Merge branch 'nd/sparse' | Junio C Hamano | 2010-01-13 | 1 | -18/+163 |
|\ \
| |/
|/| |
|