| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jk/two-way-merge-corner-case-fix' | Junio C Hamano | 2013-12-05 | 1 | -8/+17 |
|\ |
|
| * | unpack-trees: fix "read-tree -u --reset A B" with conflicted index | Jeff King | 2013-11-04 | 1 | -8/+17 |
* | | employ new explicit "exists in index?" API | Eric Sunshine | 2013-09-17 | 1 | -2/+2 |
* | | unpack-trees: plug a memory leakfc/unpack-trees-leakfix | Felipe Contreras | 2013-08-13 | 1 | -1/+3 |
* | | Convert "struct cache_entry *" to "const ..." wherever possiblend/const-struct-cache-entry | Nguyễn Thái Ngọc Duy | 2013-07-09 | 1 | -7/+7 |
* | | Merge branch 'rs/unpack-trees-tree-walk-conflict-field' | Junio C Hamano | 2013-06-24 | 1 | -15/+3 |
|\ \ |
|
| * | | unpack-trees: don't shift conflicts left and right | René Scharfe | 2013-06-17 | 1 | -15/+3 |
* | | | unpack-trees: free cache_entry array members for merges | René Scharfe | 2013-06-02 | 1 | -3/+10 |
* | | | diff-lib, read-tree, unpack-trees: mark cache_entry array paramters const | René Scharfe | 2013-06-02 | 1 | -8/+13 |
* | | | diff-lib, read-tree, unpack-trees: mark cache_entry pointers const | René Scharfe | 2013-06-02 | 1 | -41/+50 |
* | | | unpack-trees: create working copy of merge entry in merged_entry | René Scharfe | 2013-06-02 | 1 | -5/+12 |
* | | | unpack-trees: factor out dup_entry | René Scharfe | 2013-06-02 | 1 | -3/+9 |
|/ / |
|
* | | dir.c: replace is_path_excluded with now equivalent is_excluded API | Karsten Blees | 2013-04-15 | 1 | -9/+1 |
* | | Merge branch 'as/check-ignore' | Junio C Hamano | 2013-01-23 | 1 | -1/+1 |
|\ \ |
|
| * | | dir.c: use a single struct exclude_list per source of excludes | Adam Spiers | 2013-01-06 | 1 | -1/+1 |
* | | | Merge branch 'as/dir-c-cleanup' | Junio C Hamano | 2013-01-10 | 1 | -5/+7 |
|\ \ \
| |/ / |
|
| * | | dir.c: rename free_excludes() to clear_exclude_list() | Adam Spiers | 2012-12-28 | 1 | -1/+1 |
| * | | dir.c: rename excluded_from_list() to is_excluded_from_list() | Adam Spiers | 2012-12-28 | 1 | -3/+5 |
| * | | dir.c: rename path_excluded() to is_path_excluded() | Adam Spiers | 2012-12-28 | 1 | -1/+1 |
| * | | Merge branch 'jc/ls-files-i-dir' into maint | Junio C Hamano | 2012-07-11 | 1 | -1/+10 |
| |\ \ |
|
* | | | | oneway_merge(): only lstat() when told to update worktree | Martin von Zweigbergk | 2012-12-20 | 1 | -1/+1 |
* | | | | Merge branch 'tg/ce-namelen-field' | Junio C Hamano | 2012-07-23 | 1 | -1/+2 |
|\ \ \ \ |
|
| * | | | | Strip namelen out of ce_flags into a ce_namelen field | Thomas Gummerer | 2012-07-11 | 1 | -1/+2 |
* | | | | | Replace strlen() with ce_namelen() | Thomas Gummerer | 2012-07-08 | 1 | -1/+1 |
|/ / / / |
|
* | | | | Merge branch 'jc/ls-files-i-dir' | Junio C Hamano | 2012-06-21 | 1 | -1/+10 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * | | unpack-trees.c: use path_excluded() in check_ok_to_remove() | Junio C Hamano | 2012-06-05 | 1 | -1/+10 |
| |/ |
|
* | | Merge branch 'maint' | Junio C Hamano | 2012-05-20 | 1 | -1/+1 |
|\ \ |
|
| * | | Consistently use "superproject" instead of "supermodule" | Jens Lehmann | 2012-05-20 | 1 | -1/+1 |
* | | | Merge branch 'pw/message-cleanup' | Junio C Hamano | 2012-05-02 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | remove superfluous newlines in error messages | Pete Wyckoff | 2012-04-30 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge branch 'jc/index-v4' | Junio C Hamano | 2012-05-02 | 1 | -0/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | unpack-trees: preserve the index file version of original | Junio C Hamano | 2012-04-27 | 1 | -0/+1 |
| |/ |
|
* | | unpack-trees: plug minor memory leak | René Scharfe | 2012-04-10 | 1 | -9/+16 |
* | | unpack-trees: don't perform any index operation if we're not merging | René Scharfe | 2012-04-10 | 1 | -1/+1 |
|/ |
|
* | tree-walk.c: do not leak internal structure in tree_entry_len() | Nguyễn Thái Ngọc Duy | 2011-10-27 | 1 | -3/+3 |
* | Merge branch 'nd/maint-sparse-errors' | Junio C Hamano | 2011-10-13 | 1 | -4/+16 |
|\ |
|
| * | Add explanation why we do not allow to sparse checkout to empty working treend/maint-sparse-errors | Nguyễn Thái Ngọc Duy | 2011-09-22 | 1 | -1/+6 |
| * | sparse checkout: show error messages when worktree shaping fails | Nguyễn Thái Ngọc Duy | 2011-09-22 | 1 | -3/+10 |
* | | Merge branch 'mg/maint-doc-sparse-checkout' | Junio C Hamano | 2011-10-05 | 1 | -1/+1 |
|\ \ |
|
| * | | unpack-trees: print "Aborting" to stderr | Michael J Gruber | 2011-09-21 | 1 | -1/+1 |
| |/ |
|
* | | Merge branch 'jc/diff-index-unpack' | Junio C Hamano | 2011-10-05 | 1 | -0/+2 |
|\ \ |
|
| * | | unpack-trees: allow pruning with pathspec | Junio C Hamano | 2011-08-29 | 1 | -0/+2 |
| |/ |
|
* | | Merge branch 'maint' | Junio C Hamano | 2011-07-31 | 1 | -2/+13 |
|\ \ |
|
| * | | Break down no-lstat() condition checks in verify_uptodate() | Nguyễn Thái Ngọc Duy | 2011-07-31 | 1 | -2/+13 |
| |/ |
|
* | | Merge branch 'jc/diff-index-quick-exit-early' | Junio C Hamano | 2011-06-29 | 1 | -1/+3 |
|\ \
| |/
|/| |
|
| * | diff-index --quiet: learn the "stop feeding the backend early" logic | Junio C Hamano | 2011-05-31 | 1 | -1/+3 |
* | | unpack-trees: add the dry_run flag to unpack_trees_options | Jens Lehmann | 2011-05-25 | 1 | -2/+2 |
* | | sparse checkout: do not eagerly decide the fate for whole directory | Nguyễn Thái Ngọc Duy | 2011-05-10 | 1 | -29/+34 |
|/ |
|
* | 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 |