aboutsummaryrefslogtreecommitdiffstats
path: root/read-tree.c
AgeCommit message (Expand)AuthorFilesLines
2005-10-02read-tree: --trivialLinus Torvalds1-0/+12
2005-10-02read-tree: remove --head option.Junio C Hamano1-8/+2
2005-09-20Document -i flag to git-read-treeJunio C Hamano1-1/+1
2005-09-13read-tree: fix bogus debugging statement.Junio C Hamano1-6/+9
2005-09-10Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano1-2/+20
2005-09-10Plug leak in Daniel's read-tree.Junio C Hamano1-0/+1
2005-09-10[PATCH] Add debugging help for case #16 to read-tree.cJunio C Hamano1-8/+28
2005-09-10[PATCH] Disable debugging from read-tree.Junio C Hamano1-3/+10
2005-09-10[PATCH] Rewrite read-treeDaniel Barkalow1-382/+421
2005-07-29[PATCH] Unify usage strings declarationPetr Baudis1-1/+1
2005-07-14Start adding interfaces to read in partial treesLinus Torvalds1-1/+1
2005-06-15git-read-tree: fix "--reset" handlingLinus Torvalds1-0/+1
2005-06-12[PATCH] read-tree: loosen too strict index requirementsJunio C Hamano1-0/+6
2005-06-12[PATCH] Finish making --emu23 equivalent to pure 2-way merge.Junio C Hamano1-5/+132
2005-06-12[PATCH] read-tree: fix too strong index requirement #5ALTJunio C Hamano1-2/+18
2005-06-12[PATCH] read-tree --emu23.Junio C Hamano1-4/+77
2005-06-09git-read-tree: remove deleted files in the working directoryLinus Torvalds1-6/+18
2005-06-09git-read-tree: add "--reset" flagLinus Torvalds1-9/+38
2005-06-07git-read-tree: -u without -m is meaningless. Don't allow it.Linus Torvalds1-1/+3
2005-06-07git-read-tree: make one-way merge also honor the "update" flagLinus Torvalds1-5/+5
2005-06-07[PATCH] read-tree: save more user hassles during fast-forward.Junio C Hamano1-13/+36
2005-06-06git-read-tree: some "final" cleanupsLinus Torvalds1-14/+10
2005-06-06git-read-tree: simplify merge loops enormouslyLinus Torvalds1-163/+110
2005-06-06[PATCH] index locking like everybody elseJunio C Hamano1-17/+5
2005-06-05Fix off-by-one in new three-way-merge updatesLinus Torvalds1-1/+1
2005-06-05Three-way merge: fix silly bug that made trivial merges not workLinus Torvalds1-2/+2
2005-06-05git-read-tree: fix up two-way mergeLinus Torvalds1-15/+44
2005-06-05More work on merging with git-read-tree..Linus Torvalds1-19/+104
2005-06-05git-read-tree: fix up three-way merge testsLinus Torvalds1-14/+14
2005-06-05git-read-tree: be a lot more careful about merging dirty treesLinus Torvalds1-3/+51
2005-05-20sparse cleanupLinus Torvalds1-1/+1
2005-05-19[PATCH] cleanup of in-code namesAlexey Nezhdanov1-1/+1
2005-05-11Fixed a leak in read-treePetr Baudis1-1/+4
2005-05-01Add "get_sha1()" helper function.Linus Torvalds1-1/+1
2005-04-28[PATCH] Rename and extend read_tree_with_tree_or_commit_sha1Junio C Hamano1-1/+1
2005-04-22Move "read_tree()" to "tree.c" to be used as a generic helper function.Linus Torvalds1-63/+3
2005-04-22Clean up and simplify read-tree a bit.Linus Torvalds1-7/+6
2005-04-21Add support for a "GIT_INDEX_FILE" environment variable.Linus Torvalds1-8/+11
2005-04-20[PATCH] Usage-string fixes.Junio C Hamano1-4/+6
2005-04-20[PATCH] Teach read-tree about commit objectsJunio C Hamano1-10/+24
2005-04-19Make "read-tree" know how to do a "1-way merge".Linus Torvalds1-5/+39
2005-04-19Make "read-tree" take the 'stat' information for a merge result from theLinus Torvalds1-2/+39
2005-04-16Be much more liberal about the file mode bits.Linus Torvalds1-1/+1
2005-04-16Make 'read-tree' do a few more of the trivial merge cases.Linus Torvalds1-17/+53
2005-04-15Make "read-tree" merge the trees it reads by giving them consecutive states.Linus Torvalds1-6/+53
2005-04-15Encode a few extra flags per index entry.Linus Torvalds1-1/+1
2005-04-15Convert the index file reading/writing to use network byte order.Linus Torvalds1-2/+2
2005-04-13[PATCH] Consolidate the error handlingPetr Baudis1-5/+5
2005-04-11Rename ".dircache" directory to ".git"Linus Torvalds1-3/+3
2005-04-11Fix stale index.lock file removal using "atexit()".Linus Torvalds1-22/+23
2005-04-10Make "update-cache" a bit friendlier to use (and harder to mis-use).Linus Torvalds1-1/+1
2005-04-09Teach "fsck" and "read-tree" about recursive tree-nodes.Linus Torvalds1-7/+21
2005-04-09Make "read-tree" read the tree into the current directory cache.Linus Torvalds1-49/+53
2005-04-08Use "-Wall -O2" for the compiler to get more warnings.Linus Torvalds1-1/+0
2005-04-07Make read-tree actually unpack the whole tree.Linus Torvalds1-1/+41
2005-04-07Add copyright notices.Linus Torvalds1-0/+5
2005-04-07Initial revision of "git", the information manager from hellLinus Torvalds1-0/+43
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-12 22:58:57 +0000