summaryrefslogtreecommitdiff
path: root/read-tree.c
AgeCommit message (Expand)AuthorFilesLines
2006-02-23Merge branches 'jc/fix-co-candy', 'jc/fix-rename-leak' and 'ar/fix-win' into ...Libravatar Junio C Hamano1-0/+60
2006-02-22Give no terminating LF to error() function.Libravatar Junio C Hamano1-2/+2
2006-02-22checkout - eye candy.Libravatar Junio C Hamano1-0/+60
2006-02-06read-tree --aggressiveLibravatar Junio C Hamano1-0/+32
2005-12-26avoid asking ?alloc() for zero bytes.Libravatar Junio C Hamano1-7/+10
2005-11-28Make the rest of commands work from a subdirectory.Libravatar Junio C Hamano1-0/+2
2005-11-08ls-files and read-tree need core.filemodeLibravatar Alex Riesen1-0/+2
2005-10-10Remove empty directories after read-tree -u.Libravatar Junio C Hamano1-1/+30
2005-10-02read-tree: --trivialLibravatar Linus Torvalds1-0/+12
2005-10-02read-tree: remove --head option.Libravatar Junio C Hamano1-8/+2
2005-09-20Document -i flag to git-read-treeLibravatar Junio C Hamano1-1/+1
2005-09-13read-tree: fix bogus debugging statement.Libravatar Junio C Hamano1-6/+9
2005-09-10Add a new merge strategy by Fredrik Kuivinen.Libravatar Junio C Hamano1-2/+20
2005-09-10Plug leak in Daniel's read-tree.Libravatar Junio C Hamano1-0/+1
2005-09-10[PATCH] Add debugging help for case #16 to read-tree.cLibravatar Junio C Hamano1-8/+28
2005-09-10[PATCH] Disable debugging from read-tree.Libravatar Junio C Hamano1-3/+10
2005-09-10[PATCH] Rewrite read-treeLibravatar Daniel Barkalow1-382/+421
2005-07-29[PATCH] Unify usage strings declarationLibravatar Petr Baudis1-1/+1
2005-07-14Start adding interfaces to read in partial treesLibravatar Linus Torvalds1-1/+1
2005-06-15git-read-tree: fix "--reset" handlingLibravatar Linus Torvalds1-0/+1
2005-06-12[PATCH] read-tree: loosen too strict index requirementsLibravatar Junio C Hamano1-0/+6
2005-06-12[PATCH] Finish making --emu23 equivalent to pure 2-way merge.Libravatar Junio C Hamano1-5/+132
2005-06-12[PATCH] read-tree: fix too strong index requirement #5ALTLibravatar Junio C Hamano1-2/+18
2005-06-12[PATCH] read-tree --emu23.Libravatar Junio C Hamano1-4/+77
2005-06-09git-read-tree: remove deleted files in the working directoryLibravatar Linus Torvalds1-6/+18
2005-06-09git-read-tree: add "--reset" flagLibravatar Linus Torvalds1-9/+38
2005-06-07git-read-tree: -u without -m is meaningless. Don't allow it.Libravatar Linus Torvalds1-1/+3
2005-06-07git-read-tree: make one-way merge also honor the "update" flagLibravatar Linus Torvalds1-5/+5
2005-06-07[PATCH] read-tree: save more user hassles during fast-forward.Libravatar Junio C Hamano1-13/+36
2005-06-06git-read-tree: some "final" cleanupsLibravatar Linus Torvalds1-14/+10
2005-06-06git-read-tree: simplify merge loops enormouslyLibravatar Linus Torvalds1-163/+110
2005-06-06[PATCH] index locking like everybody elseLibravatar Junio C Hamano1-17/+5
2005-06-05Fix off-by-one in new three-way-merge updatesLibravatar Linus Torvalds1-1/+1
2005-06-05Three-way merge: fix silly bug that made trivial merges not workLibravatar Linus Torvalds1-2/+2
2005-06-05git-read-tree: fix up two-way mergeLibravatar Linus Torvalds1-15/+44
2005-06-05More work on merging with git-read-tree..Libravatar Linus Torvalds1-19/+104
2005-06-05git-read-tree: fix up three-way merge testsLibravatar Linus Torvalds1-14/+14
2005-06-05git-read-tree: be a lot more careful about merging dirty treesLibravatar Linus Torvalds1-3/+51
2005-05-20sparse cleanupLibravatar Linus Torvalds1-1/+1
2005-05-19[PATCH] cleanup of in-code namesLibravatar Alexey Nezhdanov1-1/+1
2005-05-11Fixed a leak in read-treeLibravatar Petr Baudis1-1/+4
2005-05-01Add "get_sha1()" helper function.Libravatar Linus Torvalds1-1/+1
2005-04-28[PATCH] Rename and extend read_tree_with_tree_or_commit_sha1Libravatar Junio C Hamano1-1/+1
2005-04-22Move "read_tree()" to "tree.c" to be used as a generic helper function.Libravatar Linus Torvalds1-63/+3
2005-04-22Clean up and simplify read-tree a bit.Libravatar Linus Torvalds1-7/+6
2005-04-21Add support for a "GIT_INDEX_FILE" environment variable.Libravatar Linus Torvalds1-8/+11
2005-04-20[PATCH] Usage-string fixes.Libravatar Junio C Hamano1-4/+6
2005-04-20[PATCH] Teach read-tree about commit objectsLibravatar Junio C Hamano1-10/+24
2005-04-19Make "read-tree" know how to do a "1-way merge".Libravatar Linus Torvalds1-5/+39
2005-04-19Make "read-tree" take the 'stat' information for a merge result from theLibravatar Linus Torvalds1-2/+39
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 04:27:42 +0000