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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[PATCH] SCSI trees, merges and git status	James Bottomley	2005-04-18	1	-1/+10
\| \| \| \| \| \| \| \| \| \|	Doing the latest SCSI merge exposed two bugs in your merge script: 1) It doesn't like a completely new directory (the misc tree contains a new drivers/scsi/lpfc) 2) the merge testing logic is wrong. You only want to exit 1 if the merge fails.
*	Change merge-cache and git-merge-one-file to use the SHA1 of the file	Linus Torvalds	2005-04-18	1	-22/+38
\| \| \| \| \| \|	instead of a checked-out temporary copy. If merging requires a checked-out-copy, we now do so with "unpack-file".
*	Add the simple scripts I used to do a merge with content conflicts.	Linus Torvalds	2005-04-18	1	-0/+35
	They sure as hell aren't perfect, but they allow you to do: ./git-pull-script {other-git-directory} to do the initial merge, and if that had content clashes, you do merge-cache ./git-merge-one-file-script -a which tries to auto-merge. When/if the auto-merge fails, it will leave the last file in your working directory, and you can edit it and then when you're happy you can do "update-cache filename" on it. Re-do the merge-cache thing until there are no files left to be merged, and now you can write the tree and commit: write-tree commit-tree .... -p $(cat .git/HEAD) -p $(cat .git/MERGE_HEAD) and you're done.