summaryrefslogtreecommitdiff
path: root/read-tree.c
Commit message (Expand)AuthorAgeFilesLines
* read-tree: fix bogus debugging statement.Junio C Hamano2005-09-131-6/+9
* Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano2005-09-101-2/+20
* Plug leak in Daniel's read-tree.Junio C Hamano2005-09-101-0/+1
* [PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano2005-09-101-8/+28
* [PATCH] Disable debugging from read-tree.Junio C Hamano2005-09-101-3/+10
* [PATCH] Rewrite read-treeDaniel Barkalow2005-09-101-382/+421
* [PATCH] Unify usage strings declarationPetr Baudis2005-07-291-1/+1
* Start adding interfaces to read in partial treesLinus Torvalds2005-07-141-1/+1
* git-read-tree: fix "--reset" handlingLinus Torvalds2005-06-151-0/+1
* [PATCH] read-tree: loosen too strict index requirementsJunio C Hamano2005-06-121-0/+6
* [PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano2005-06-121-5/+132
* [PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano2005-06-121-2/+18
* [PATCH] read-tree --emu23.Junio C Hamano2005-06-121-4/+77
* git-read-tree: remove deleted files in the working directoryLinus Torvalds2005-06-091-6/+18
* git-read-tree: add "--reset" flagLinus Torvalds2005-06-091-9/+38
* git-read-tree: -u without -m is meaningless. Don't allow it.Linus Torvalds2005-06-071-1/+3
* git-read-tree: make one-way merge also honor the "update" flagLinus Torvalds2005-06-071-5/+5
* [PATCH] read-tree: save more user hassles during fast-forward.Junio C Hamano2005-06-071-13/+36
* git-read-tree: some "final" cleanupsLinus Torvalds2005-06-061-14/+10
* git-read-tree: simplify merge loops enormouslyLinus Torvalds2005-06-061-163/+110
* [PATCH] index locking like everybody elseJunio C Hamano2005-06-061-17/+5
* Fix off-by-one in new three-way-merge updatesLinus Torvalds2005-06-051-1/+1
* Three-way merge: fix silly bug that made trivial merges not workLinus Torvalds2005-06-051-2/+2
* git-read-tree: fix up two-way mergeLinus Torvalds2005-06-051-15/+44
* More work on merging with git-read-tree..Linus Torvalds2005-06-051-19/+104
* git-read-tree: fix up three-way merge testsLinus Torvalds2005-06-051-14/+14
* git-read-tree: be a lot more careful about merging dirty treesLinus Torvalds2005-06-051-3/+51
* sparse cleanupLinus Torvalds2005-05-201-1/+1
* [PATCH] cleanup of in-code namesAlexey Nezhdanov2005-05-191-1/+1
* Fixed a leak in read-treePetr Baudis2005-05-111-1/+4
* Add "get_sha1()" helper function.Linus Torvalds2005-05-011-1/+1
* [PATCH] Rename and extend read_tree_with_tree_or_commit_sha1Junio C Hamano2005-04-281-1/+1
* Move "read_tree()" to "tree.c" to be used as a generic helper function.Linus Torvalds2005-04-221-63/+3
* Clean up and simplify read-tree a bit.Linus Torvalds2005-04-221-7/+6
* Add support for a "GIT_INDEX_FILE" environment variable.Linus Torvalds2005-04-211-8/+11
* [PATCH] Usage-string fixes.Junio C Hamano2005-04-201-4/+6
* [PATCH] Teach read-tree about commit objectsJunio C Hamano2005-04-201-10/+24
* Make "read-tree" know how to do a "1-way merge".Linus Torvalds2005-04-191-5/+39
* Make "read-tree" take the 'stat' information for a merge result from theLinus Torvalds2005-04-191-2/+39
* Be much more liberal about the file mode bits.Linus Torvalds2005-04-161-1/+1
* Make 'read-tree' do a few more of the trivial merge cases.Linus Torvalds2005-04-161-17/+53
* Make "read-tree" merge the trees it reads by giving them consecutive states.Linus Torvalds2005-04-151-6/+53
* Encode a few extra flags per index entry.Linus Torvalds2005-04-151-1/+1
* Convert the index file reading/writing to use network byte order.Linus Torvalds2005-04-151-2/+2
* [PATCH] Consolidate the error handlingPetr Baudis2005-04-131-5/+5
* Rename ".dircache" directory to ".git"Linus Torvalds2005-04-111-3/+3
* Fix stale index.lock file removal using "atexit()".Linus Torvalds2005-04-111-22/+23
* Make "update-cache" a bit friendlier to use (and harder to mis-use).Linus Torvalds2005-04-101-1/+1
* Teach "fsck" and "read-tree" about recursive tree-nodes.Linus Torvalds2005-04-091-7/+21
* Make "read-tree" read the tree into the current directory cache.Linus Torvalds2005-04-091-49/+53
View Lorry Controller Status