summaryrefslogtreecommitdiff
path: root/read-tree.c
AgeCommit message (Expand)Author
2005-09-11Plug leak in Daniel's read-tree.Junio C Hamano
2005-09-11[PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano
2005-09-11[PATCH] Disable debugging from read-tree.Junio C Hamano
2005-09-11[PATCH] Rewrite read-treeDaniel Barkalow
2005-07-30[PATCH] Unify usage strings declarationPetr Baudis
2005-07-14Start adding interfaces to read in partial treesLinus Torvalds
2005-06-15git-read-tree: fix "--reset" handlingLinus Torvalds
2005-06-13[PATCH] read-tree: loosen too strict index requirementsJunio C Hamano
2005-06-13[PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano
2005-06-13[PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano
2005-06-13[PATCH] read-tree --emu23.Junio C Hamano
2005-06-09git-read-tree: remove deleted files in the working directoryLinus Torvalds
2005-06-09git-read-tree: add "--reset" flagLinus Torvalds
2005-06-07git-read-tree: -u without -m is meaningless. Don't allow it.Linus Torvalds
2005-06-07git-read-tree: make one-way merge also honor the "update" flagLinus Torvalds
2005-06-07[PATCH] read-tree: save more user hassles during fast-forward.Junio C Hamano
2005-06-06git-read-tree: some "final" cleanupsLinus Torvalds
2005-06-06git-read-tree: simplify merge loops enormouslyLinus Torvalds
2005-06-06[PATCH] index locking like everybody elseJunio C Hamano
2005-06-06Fix off-by-one in new three-way-merge updatesLinus Torvalds
2005-06-06Three-way merge: fix silly bug that made trivial merges not workLinus Torvalds
2005-06-06git-read-tree: fix up two-way mergeLinus Torvalds
2005-06-06More work on merging with git-read-tree..Linus Torvalds
2005-06-06git-read-tree: fix up three-way merge testsLinus Torvalds
2005-06-06git-read-tree: be a lot more careful about merging dirty treesLinus Torvalds
2005-05-20sparse cleanupLinus Torvalds
2005-05-19[PATCH] cleanup of in-code namesAlexey Nezhdanov
2005-05-11Fixed a leak in read-treePetr Baudis
2005-05-01Add "get_sha1()" helper function.Linus Torvalds
2005-04-28[PATCH] Rename and extend read_tree_with_tree_or_commit_sha1Junio C Hamano
2005-04-22Move "read_tree()" to "tree.c" to be used as a generic helper function.Linus Torvalds
2005-04-22Clean up and simplify read-tree a bit.Linus Torvalds
2005-04-21Add support for a "GIT_INDEX_FILE" environment variable.Linus Torvalds
2005-04-21[PATCH] Usage-string fixes.Junio C Hamano
2005-04-21[PATCH] Teach read-tree about commit objectsJunio C Hamano
2005-04-19Make "read-tree" know how to do a "1-way merge".Linus Torvalds
2005-04-19Make "read-tree" take the 'stat' information for a merge result from theLinus Torvalds
2005-04-17Be much more liberal about the file mode bits.Linus Torvalds
2005-04-16Make 'read-tree' do a few more of the trivial merge cases.Linus Torvalds
2005-04-16Make "read-tree" merge the trees it reads by giving them consecutive states.Linus Torvalds
2005-04-16Encode a few extra flags per index entry.Linus Torvalds
2005-04-15Convert the index file reading/writing to use network byte order.Linus Torvalds
2005-04-13[PATCH] Consolidate the error handlingPetr Baudis
2005-04-11Rename ".dircache" directory to ".git"Linus Torvalds
2005-04-11Fix stale index.lock file removal using "atexit()".Linus Torvalds
2005-04-10Make "update-cache" a bit friendlier to use (and harder to mis-use).Linus Torvalds
2005-04-09Teach "fsck" and "read-tree" about recursive tree-nodes.Linus Torvalds
2005-04-09Make "read-tree" read the tree into the current directory cache.Linus Torvalds
2005-04-08Use "-Wall -O2" for the compiler to get more warnings.Linus Torvalds
2005-04-08Make read-tree actually unpack the whole tree.Linus Torvalds