delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Change merge-cache and git-merge-one-file to use the SHA1 of the file	Linus Torvalds	2005-04-18	1	-24/+3
\| \| \| \| \| \|	instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".
*	Ass a "merge-cache" helper program to execute a merge on	Linus Torvalds	2005-04-17	1	-0/+127
	any unmerged files. This one doesn't actually do the merging, but it makes it easy to script the programs that do using it.