development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-17 23:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
311 commits 6 branches 952 tags 532 MiB
Commit graph

3 commits

Author SHA1 Message Date
James Bottomley e2b6a9d0bf [PATCH] make file merging respect permissions 
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>
 2005-04-23 20:50:10 -07:00
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