2 Commits

Author	SHA1	Message	Date
Linus Torvalds	e3b4be7f6c	Change merge-cache and git-merge-one-file to use the SHA1 of the file ... instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".	2005-04-18 14:17:58 -07:00
Linus Torvalds	75118b13bc	Ass a "merge-cache" helper program to execute a merge on ... any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.	2005-04-17 19:52:54 -07:00