aboutsummaryrefslogtreecommitdiff
path: root/builtin-read-tree.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/maint-read-tree-multi'Junio C Hamano2009-04-22
|\
| * read-tree -m A B: prime cache-tree from the switched-to treeJunio C Hamano2009-04-20
| * Move prime_cache_tree() to cache-tree.cJunio C Hamano2009-04-20
| * read-tree A B: do not corrupt cache-treeJunio C Hamano2009-04-20
* | Turn the flags in struct dir_struct into a single variableJohannes Schindelin2009-02-18
|/
* checkout: Fix "initial checkout" detectionJunio C Hamano2008-11-12
* Merge branch 'jc/maint-checkout-keep-remove' into maintJunio C Hamano2008-09-18
|\
| * checkout: do not lose staged removalJunio C Hamano2008-09-09
* | Start conforming code to "git subcmd" style part 3Heikki Orsila2008-09-15
|/
* read-tree: setup worktree if merge is requiredNguyễn Thái Ngọc Duy2008-08-28
* Move read_cache_unmerged() to read-cache.cMiklos Vajna2008-06-30
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* Move name hashing functions into a file of its ownLinus Torvalds2008-04-09
* read-tree() and unpack_trees(): use consistent limitJunio C Hamano2008-03-13
* Make 'unpack_trees()' have a separate source and destination indexLinus Torvalds2008-03-09
* Make 'unpack_trees()' take the index to work on as an argumentLinus Torvalds2008-03-09
* Merge branch 'db/checkout'Junio C Hamano2008-02-27
|\
| * Allow callers of unpack_trees() to handle failureDaniel Barkalow2008-02-09
* | Name hash fixups: export (and rename) remove_hash_entryLinus Torvalds2008-02-22
* | git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()Junio C Hamano2008-02-21
|/
* Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-21
* Improve use of lockfile APIBrandon Casey2008-01-16
* Clean-up read-tree error condition.Junio C Hamano2007-08-16
* Fix read-tree merging more than 3 trees using 3-way mergeJunio C Hamano2007-08-15
* Start moving unpack-trees to "struct tree_desc"Linus Torvalds2007-08-10
* read-tree: remove unnecessary call to setup_git_directory()Johannes Schindelin2007-08-02
* Document git read-tree --trivialJakub Narebski2007-06-16
* Merge branch 'jc/read-tree-df' (early part)Junio C Hamano2007-04-07
|\
| * Fix read-tree --prefix=dir/.Junio C Hamano2007-04-04
* | git-read-tree --index-output=<file>Junio C Hamano2007-04-03
* | _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano2007-04-03
|/
* read-tree: use xcallocJames Bowes2007-03-27
* Initialize tree descriptors with a helper function rather than by hand.Linus Torvalds2007-03-21
* Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-20
* read-tree: document --exclude-per-directoryJunio C Hamano2006-12-05
* read-tree: further loosen "working file will be lost" check.Junio C Hamano2006-12-05
* Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-23
* remove unnecessary initializationsDavid Rientjes2006-08-15
* Merge branch 'js/read-tree'Junio C Hamano2006-08-12
|\
| * read-tree: move merge functions to the libraryJohannes Schindelin2006-07-30
| * read-trees: refactor the unpack_trees() partJohannes Schindelin2006-07-30
* | Better error message when we are unable to lock the index fileJunio C Hamano2006-08-12
* | read-tree: shadowed variable fix.Junio C Hamano2006-08-03
|/
* Call setup_git_directory() much earlierLinus Torvalds2006-07-29
* checkout -f failed to check out a file if an existing directory interfered.Junio C Hamano2006-07-16
* Avoid C99 initializersShawn Pearce2006-07-10
* Close the index file between writing and committingJohannes Schindelin2006-07-08
* Don't use empty structure initializers.Florian Forster2006-06-18
* Merge branch 'jc/rw-prefix'Junio C Hamano2006-06-17
* Make index file locking code reusable to others.Junio C Hamano2006-06-06