14 Commits (85b7cfb1036b4218d13cbc215729ad083a61a0ea)

Author SHA1 Message Date
Florian Forster 571ea603a6 Don't use empty structure initializers. 19 years ago
Junio C Hamano 021b6e4549 Make index file locking code reusable to others. 19 years ago
Linus Torvalds eff97e3fae read-tree: fix eye-candy. 19 years ago
Junio C Hamano b266b123cd Fix earlier mismerges. 19 years ago
Junio C Hamano b0d6e64629 read-tree --reset: update working tree file for conflicted paths. 19 years ago
Linus Torvalds 4c068a9831 tree_entry(): new tree-walking helper function 19 years ago
Junio C Hamano e76abd7014 adjust to the rebased series by Linus. 19 years ago
Linus Torvalds 15b5536ee4 Remove last vestiges of generic tree_entry_list 19 years ago
Linus Torvalds 2d9c58c69d Remove "tree->entries" tree-entry list from tree parser 19 years ago
Linus Torvalds 1ccf5a345a builtin-read-tree.c: avoid tree_entry_list in prime_cache_tree_rec() 19 years ago
Linus Torvalds 3a7c352bd0 Make "tree_entry" have a SHA1 instead of a union of object pointers 19 years ago
Linus Torvalds 136f2e548a Make "struct tree" contain the pointer to the tree buffer 19 years ago
Linus Torvalds 097dc3d8c3 Remove "tree->entries" tree-entry list from tree parser 19 years ago
Linus Torvalds a755dfe45c Make "tree_entry" have a SHA1 instead of a union of object pointers 19 years ago
Linus Torvalds d2eafb7661 Add raw tree buffer info to "struct tree" 19 years ago
Peter Eriksen d147e501f3 Builtin git-read-tree. 19 years ago
Junio C Hamano d6970e42a1 read-tree: reorganize bind_merge code. 19 years ago
Junio C Hamano fcc387db9b read-tree -m -u: do not overwrite or remove untracked working tree files. 19 years ago
Linus Torvalds 6d6776cb49 read-tree --reset -u fix. 19 years ago
Junio C Hamano 613f02739a read-tree -u one-way merge fix to check out locally modified paths. 19 years ago
Linus Torvalds 76b99b8161 Allow one-way tree merge to remove old files 19 years ago
Dmitry V. Levin 31fff305bc Separate object name errors from usage errors 19 years ago
Johannes Schindelin b6c4a480b3 Fix crash when reading the empty tree 19 years ago
Junio C Hamano c2b9ae4330 read-tree: invalidate cache-tree entry when a new index entry is added. 19 years ago
Junio C Hamano f4c6f2d328 read-tree: --prefix=<path>/ option. 19 years ago
Junio C Hamano 7927a55d5b read-tree: teach 1-way merege and plain read to prime cache-tree. 19 years ago
Junio C Hamano b34c39cf31 read-tree: teach 1 and 2 way merges about cache-tree. 19 years ago
Junio C Hamano bad68ec924 index: make the index file format extensible. 19 years ago
Peter Eriksen 90321c106c Replace xmalloc+memset(0) with xcalloc. 19 years ago
Jason Riedy 72fdfb50f7 Use sigaction and SA_RESTART in read-tree.c; add option in Makefile. 19 years ago
Junio C Hamano 84a9b58c42 sha1_name: warning ambiguous refs. 19 years ago
Shawn Pearce de84f99c12 Add --temp and --stage=all options to checkout-index. 19 years ago
Junio C Hamano afaa8d66ab Documentation: read-tree --aggressive 19 years ago
Junio C Hamano 1142038098 read-tree --aggressive: remove deleted entry from the working tree. 19 years ago
Junio C Hamano bd2afde8a3 Give no terminating LF to error() function. 19 years ago
Junio C Hamano 744633cbf2 checkout - eye candy. 19 years ago
Junio C Hamano 5f73076c1a "Assume unchanged" git 19 years ago
Junio C Hamano 1b1fdf8c2f read-tree --aggressive 19 years ago
Junio C Hamano 7e4a2a8483 avoid asking ?alloc() for zero bytes. 19 years ago
Junio C Hamano 53228a5fb8 Make the rest of commands work from a subdirectory. 19 years ago
Alex Riesen 39b4ac9968 ls-files and read-tree need core.filemode 19 years ago
Junio C Hamano 340e4f88c0 Remove empty directories after read-tree -u. 19 years ago
Linus Torvalds 23822a355d read-tree: --trivial 19 years ago
Junio C Hamano 7dd43575f8 read-tree: remove --head option. 19 years ago
Junio C Hamano f318dd229f Document -i flag to git-read-tree 19 years ago
Junio C Hamano 2ba6c47be1 read-tree: fix bogus debugging statement. 19 years ago
Junio C Hamano 720d150c48 Add a new merge strategy by Fredrik Kuivinen. 19 years ago
Junio C Hamano bb97a2a804 Plug leak in Daniel's read-tree. 19 years ago
Junio C Hamano 4d3fe0c5f3 [PATCH] Add debugging help for case #16 to read-tree.c 19 years ago
Junio C Hamano 2ab706a38f [PATCH] Disable debugging from read-tree. 19 years ago