summaryrefslogtreecommitdiff
path: root/builtin-read-tree.c
Commit message (Expand)AuthorAgeFilesLines
* read-tree: migrate to parse-optionsStephen Boyd2009-06-271-96/+74
* read-tree: convert unhelpful usage()'s to helpful die()'sStephen Boyd2009-06-271-3/+3
* Merge branch 'jc/maint-read-tree-multi'Junio C Hamano2009-04-221-40/+8
|\
| * read-tree -m A B: prime cache-tree from the switched-to treeJunio C Hamano2009-04-201-0/+5
| * Move prime_cache_tree() to cache-tree.cJunio C Hamano2009-04-201-36/+1
| * read-tree A B: do not corrupt cache-treeJunio C Hamano2009-04-201-4/+2
* | Turn the flags in struct dir_struct into a single variableJohannes Schindelin2009-02-181-1/+1
|/
* checkout: Fix "initial checkout" detectionJunio C Hamano2008-11-121-1/+1
* Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano2008-09-181-0/+1
|\
| * checkout: do not lose staged removalJunio C Hamano2008-09-091-0/+1
* | Start conforming code to "git subcmd" style part 3Heikki Orsila2008-09-151-1/+1
|/
* read-tree: setup worktree if merge is requiredNguyễn Thái Ngọc Duy2008-08-281-0/+2
* Move read_cache_unmerged() to read-cache.cMiklos Vajna2008-06-301-24/+0
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-3/+1
* Move name hashing functions into a file of its ownLinus Torvalds2008-04-091-1/+1
* read-tree() and unpack_trees(): use consistent limitJunio C Hamano2008-03-131-5/+4
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-091-22/+2
* Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-091-0/+1
* Merge branch 'db/checkout'Junio C Hamano2008-02-271-1/+2
|\
| * Allow callers of unpack_trees() to handle failureDaniel Barkalow2008-02-091-1/+2
* | Name hash fixups: export (and rename) remove_hash_entryLinus Torvalds2008-02-221-0/+1
* | git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()Junio C Hamano2008-02-211-1/+1
|/
* Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-211-2/+1
* Improve use of lockfile APIBrandon Casey2008-01-161-1/+1
* Clean-up read-tree error condition.Junio C Hamano2007-08-161-6/+3
* Fix read-tree merging more than 3 trees using 3-way mergeJunio C Hamano2007-08-151-2/+6
* Start moving unpack-trees to "struct tree_desc"Linus Torvalds2007-08-101-8/+18
* read-tree: remove unnecessary call to setup_git_directory()Johannes Schindelin2007-08-021-1/+0
* Document git read-tree --trivialJakub Narebski2007-06-161-1/+1
* Merge branch 'jc/read-tree-df' (early part)Junio C Hamano2007-04-071-0/+1
|\
| * Fix read-tree --prefix=dir/.Junio C Hamano2007-04-041-0/+1
* | git-read-tree --index-output=<file>Junio C Hamano2007-04-031-1/+6
* | _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano2007-04-031-2/+2
|/
* read-tree: use xcallocJames Bowes2007-03-271-1/+1
* Initialize tree descriptors with a helper function rather than by hand.Linus Torvalds2007-03-211-2/+1
* Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-201-2/+2
* read-tree: document --exclude-per-directoryJunio C Hamano2006-12-051-1/+1
* read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-051-0/+20
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-231-1/+1
* remove unnecessary initializationsDavid Rientjes2006-08-151-1/+1
* Merge branch 'js/read-tree'Junio C Hamano2006-08-121-823/+38
|\
| * read-tree: move merge functions to the libraryJohannes Schindelin2006-07-301-397/+1
| * read-trees: refactor the unpack_trees() partJohannes Schindelin2006-07-301-483/+94
* | Better error message when we are unable to lock the index fileJunio C Hamano2006-08-121-3/+1
* | read-tree: shadowed variable fix.Junio C Hamano2006-08-031-1/+1
|/
* Call setup_git_directory() much earlierLinus Torvalds2006-07-291-2/+1
* checkout -f failed to check out a file if an existing directory interfered.Junio C Hamano2006-07-161-2/+2
* Avoid C99 initializersShawn Pearce2006-07-101-10/+8
* Close the index file between writing and committingJohannes Schindelin2006-07-081-1/+1
* Don't use empty structure initializers.Florian Forster2006-06-181-2/+1
View Lorry Controller Status