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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[PATCH] make file merging respect permissions	James Bottomley	2005-04-23	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1) permissions aren't respected in the merge script (primarily because they're never passed in to it in the first place). Fix that and also check for permission conflicts in the merge 2) the delete of a file in both branches may indeed be just that, but it could also be the indicator of a rename conflict (file moved to different locations in both branches), so error out and ask the committer for guidance. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
*	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.