tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2005-05-06	Add http and local transport support for git-pull-script.	Junio C Hamano	1	-6/+31
	Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-05-05	Split "git-pull-script" into two parts	Linus Torvalds	1	-45/+1
	Separate out the merge resolve from the actual getting of the data. Also, update the resolve phase to take advantage of the fact that we don't need to do the commit->tree object lookup by hand, since all the actors involved happily just act on a commit object these days.
2005-05-05	git-pull-script: do the diffstat also for the fast-forward case	Linus Torvalds	1	-0/+1
	This way you always see what the state change was.
2005-05-04	Teach "git-pull-script" about alternate HEAD's to pull..	Linus Torvalds	1	-2/+3
	People are already starting to use a multi-head model.
2005-05-04	git-pull-script: add a final "diffstat" to show the result of the merge.	Linus Torvalds	1	-0/+1
	This is useful to verify that you got the right thing.
2005-04-29	Update the merge scripts for the big git rename.	Linus Torvalds	1	-11/+11
	Let's see what else I forgot..
2005-04-29	[PATCH] GIT: Honour SHA1_FILE_DIRECTORY env var in git-pull-script	Rene Scharfe	1	-1/+1
	If you set SHA1_FILE_DIRECTORY to something else than .git/objects git-pull-script will store the fetched files in a location the rest of the tools does not expect. git-prune-script also ignores this setting, but I think this is good, because pruning a shared tree to fit a single project means throwing away a lot of useful data. :-) Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-26	git-pull-script: do automatic merges	Linus Torvalds	1	-3/+11
	When the trivial "read-tree" merge fails, fall back on the (equally trivial) automatic merge script instead of forcing the user to do it by hand. When _that_ fails, you get to do a manual merge.
2005-04-19	Update "git-pull-script" to use "read-tree -m" for	Linus Torvalds	1	-2/+2
	reading a single tree too. That should speed up a trivial merge noticeably. Also, don't bother reading back the tree we just wrote when we committed a real merge. It had better be the same one we still have..
2005-04-19	Make git-pull-script do the right thing for symlinked HEAD's.	Linus Torvalds	1	-1/+3
	Also exit gracefully if the HEAD pull failed, rather than use a possibly stale MERGE_HEAD.
2005-04-18	[PATCH] Do not let rsync obliterate .git/object symbolic link.	Junio C Hamano	1	-1/+1
	Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-04-18	Add "update-cache --refresh" to git-pull-script to make sure	Linus Torvalds	1	-2/+2
	out index is all ready to go after a pull. Noted by Russell King
2005-04-18	Add the simple scripts I used to do a merge with content conflicts.	Linus Torvalds	1	-0/+46
	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.