summaryrefslogtreecommitdiff
path: root/builtin-read-tree.c
AgeCommit message (Expand)AuthorFilesLines
2008-11-12checkout: Fix "initial checkout" detectionLibravatar Junio C Hamano1-1/+1
2008-09-18Merge branch 'jc/maint-checkout-keep-remove' into maintLibravatar Junio C Hamano1-0/+1
2008-09-15Start conforming code to "git subcmd" style part 3Libravatar Heikki Orsila1-1/+1
2008-09-09checkout: do not lose staged removalLibravatar Junio C Hamano1-0/+1
2008-08-28read-tree: setup worktree if merge is requiredLibravatar Nguyễn Thái Ngọc Duy1-0/+2
2008-06-30Move read_cache_unmerged() to read-cache.cLibravatar Miklos Vajna1-24/+0
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-3/+1
2008-04-09Move name hashing functions into a file of its ownLibravatar Linus Torvalds1-1/+1
2008-03-13read-tree() and unpack_trees(): use consistent limitLibravatar Junio C Hamano1-5/+4
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLibravatar Linus Torvalds1-22/+2
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLibravatar Linus Torvalds1-0/+1
2008-02-27Merge branch 'db/checkout'Libravatar Junio C Hamano1-1/+2
2008-02-22Name hash fixups: export (and rename) remove_hash_entryLibravatar Linus Torvalds1-0/+1
2008-02-21git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()Libravatar Junio C Hamano1-1/+1
2008-02-09Allow callers of unpack_trees() to handle failureLibravatar Daniel Barkalow1-1/+2
2008-01-21Make on-disk index representation separate from in-core oneLibravatar Linus Torvalds1-2/+1
2008-01-16Improve use of lockfile APILibravatar Brandon Casey1-1/+1
2007-08-16Clean-up read-tree error condition.Libravatar Junio C Hamano1-6/+3
2007-08-15Fix read-tree merging more than 3 trees using 3-way mergeLibravatar Junio C Hamano1-2/+6
2007-08-10Start moving unpack-trees to "struct tree_desc"Libravatar Linus Torvalds1-8/+18
2007-08-02read-tree: remove unnecessary call to setup_git_directory()Libravatar Johannes Schindelin1-1/+0
2007-06-16Document git read-tree --trivialLibravatar Jakub Narebski1-1/+1
2007-04-07Merge branch 'jc/read-tree-df' (early part)Libravatar Junio C Hamano1-0/+1
2007-04-04Fix read-tree --prefix=dir/.Libravatar Junio C Hamano1-0/+1
2007-04-03git-read-tree --index-output=<file>Libravatar Junio C Hamano1-1/+6
2007-04-03_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Libravatar Junio C Hamano1-2/+2
2007-03-27read-tree: use xcallocLibravatar James Bowes1-1/+1
2007-03-21Initialize tree descriptors with a helper function rather than by hand.Libravatar Linus Torvalds1-2/+1
2007-02-20Mechanical conversion to use prefixcmp()Libravatar Junio C Hamano1-2/+2
2006-12-05read-tree: document --exclude-per-directoryLibravatar Junio C Hamano1-1/+1
2006-12-05read-tree: further loosen "working file will be lost" check.Libravatar Junio C Hamano1-0/+20
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Libravatar Shawn Pearce1-1/+1
2006-08-15remove unnecessary initializationsLibravatar David Rientjes1-1/+1
2006-08-12Merge branch 'js/read-tree'Libravatar Junio C Hamano1-823/+38
2006-08-12Better error message when we are unable to lock the index fileLibravatar Junio C Hamano1-3/+1
2006-08-03read-tree: shadowed variable fix.Libravatar Junio C Hamano1-1/+1
2006-07-30read-tree: move merge functions to the libraryLibravatar Johannes Schindelin1-397/+1
2006-07-30read-trees: refactor the unpack_trees() partLibravatar Johannes Schindelin1-483/+94
2006-07-29Call setup_git_directory() much earlierLibravatar Linus Torvalds1-2/+1
2006-07-16checkout -f failed to check out a file if an existing directory interfered.Libravatar Junio C Hamano1-2/+2
2006-07-10Avoid C99 initializersLibravatar Shawn Pearce1-10/+8
2006-07-08Close the index file between writing and committingLibravatar Johannes Schindelin1-1/+1
2006-06-18Don't use empty structure initializers.Libravatar Florian Forster1-2/+1
2006-06-17Merge branch 'jc/rw-prefix'Libravatar Junio C Hamano1-6/+64
2006-06-06Make index file locking code reusable to others.Libravatar Junio C Hamano1-4/+4
2006-06-05read-tree: fix eye-candy.Libravatar Linus Torvalds1-0/+1
2006-06-03Merge branch 'lt/tree-2'Libravatar Junio C Hamano1-12/+56
2006-06-03read-tree --reset: update working tree file for conflicted paths.Libravatar Junio C Hamano1-10/+14
2006-05-30tree_entry(): new tree-walking helper functionLibravatar Linus Torvalds1-23/+13
2006-05-29Remove last vestiges of generic tree_entry_listLibravatar Linus Torvalds1-1/+44