aboutsummaryrefslogtreecommitdiffstats
path: root/builtin-read-tree.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds1-235/+0
2010-01-24Merge branch 'jc/fix-tree-walk'Junio C Hamano1-0/+36
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano1-0/+2
2010-01-13Merge branch 'nd/sparse'Junio C Hamano1-1/+3
2010-01-07read-tree --debug-unpackJunio C Hamano1-0/+36
2009-12-25resolve-undo: record resolved conflicts in a new index extension sectionJunio C Hamano1-0/+2
2009-11-10Let 'git <command> -h' show usage without a git dirJonathan Nieder1-2/+2
2009-08-23read-tree: add --no-sparse-checkout to disable sparse checkout supportNguyễn Thái Ngọc Duy1-1/+3
2009-08-17read-tree: Fix regression with creation of a new index file.Alexandre Julliard1-4/+6
2009-06-27read-tree: migrate to parse-optionsStephen Boyd1-96/+74
2009-06-27read-tree: convert unhelpful usage()'s to helpful die()'sStephen Boyd1-3/+3
2009-04-22Merge branch 'jc/maint-read-tree-multi'Junio C Hamano1-40/+8
2009-04-20read-tree -m A B: prime cache-tree from the switched-to treeJunio C Hamano1-0/+5
2009-04-20Move prime_cache_tree() to cache-tree.cJunio C Hamano1-36/+1
2009-04-20read-tree A B: do not corrupt cache-treeJunio C Hamano1-4/+2
2009-02-18Turn the flags in struct dir_struct into a single variableJohannes Schindelin1-1/+1
2008-11-12checkout: Fix "initial checkout" detectionJunio C Hamano1-1/+1
2008-09-18Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano1-0/+1
2008-09-15Start conforming code to "git subcmd" style part 3Heikki Orsila1-1/+1
2008-09-09checkout: do not lose staged removalJunio C Hamano1-0/+1
2008-08-28read-tree: setup worktree if merge is requiredNguyễn Thái Ngọc Duy1-0/+2
2008-06-30Move read_cache_unmerged() to read-cache.cMiklos Vajna1-24/+0
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin1-3/+1
2008-04-09Move name hashing functions into a file of its ownLinus Torvalds1-1/+1
2008-03-13read-tree() and unpack_trees(): use consistent limitJunio C Hamano1-5/+4
2008-03-09Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds1-22/+2
2008-03-09Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds1-0/+1
2008-02-27Merge branch 'db/checkout'Junio C Hamano1-1/+2
2008-02-22Name hash fixups: export (and rename) remove_hash_entryLinus Torvalds1-0/+1
2008-02-21git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()Junio C Hamano1-1/+1
2008-02-09Allow callers of unpack_trees() to handle failureDaniel Barkalow1-1/+2
2008-01-21Make on-disk index representation separate from in-core oneLinus Torvalds1-2/+1
2008-01-16Improve use of lockfile APIBrandon Casey1-1/+1
2007-08-16Clean-up read-tree error condition.Junio C Hamano1-6/+3
2007-08-15Fix read-tree merging more than 3 trees using 3-way mergeJunio C Hamano1-2/+6
2007-08-10Start moving unpack-trees to "struct tree_desc"Linus Torvalds1-8/+18
2007-08-02read-tree: remove unnecessary call to setup_git_directory()Johannes Schindelin1-1/+0
2007-06-16Document git read-tree --trivialJakub Narebski1-1/+1
2007-04-07Merge branch 'jc/read-tree-df' (early part)Junio C Hamano1-0/+1
2007-04-04Fix read-tree --prefix=dir/.Junio C Hamano1-0/+1
2007-04-03git-read-tree --index-output=<file>Junio C Hamano1-1/+6
2007-04-03_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano1-2/+2
2007-03-27read-tree: use xcallocJames Bowes1-1/+1
2007-03-21Initialize tree descriptors with a helper function rather than by hand.Linus Torvalds1-2/+1
2007-02-20Mechanical conversion to use prefixcmp()Junio C Hamano1-2/+2
2006-12-05read-tree: document --exclude-per-directoryJunio C Hamano1-1/+1
2006-12-05read-tree: further loosen "working file will be lost" check.Junio C Hamano1-0/+20
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce1-1/+1
2006-08-15remove unnecessary initializationsDavid Rientjes1-1/+1
2006-08-12Merge branch 'js/read-tree'Junio C Hamano1-823/+38