tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2005-05-30	git-resolve-script: use "git-apply --stat" instead of diffstat	Linus Torvalds	1	-2/+2
	Not everybody necessarily even has diffstat installed.
2005-05-25	[PATCH] optimize git-resolve-script	Jeff Garzik	1	-2/+2
	This change was suggested for my git-switch-tree script, and the same issues apply to core git's git-resolve-script as well.
2005-05-09	Introduce GIT_DIR environment variable.	Junio C Hamano	1	-5/+10
	During the mailing list discussion on renaming GIT_ environment variables, people felt that having one environment that lets the user (or Porcelain) specify both SHA1_FILE_DIRECTORY (now GIT_OBJECT_DIRECTORY) and GIT_INDEX_FILE for the default layout would be handy. This change introduces GIT_DIR environment variable, from which the defaults for GIT_INDEX_FILE and GIT_OBJECT_DIRECTORY are derived. When GIT_DIR is not defined, it defaults to ".git". GIT_INDEX_FILE defaults to "$GIT_DIR/index" and GIT_OBJECT_DIRECTORY defaults to "$GIT_DIR/objects". Special thanks for ideas and discussions go to Petr Baudis and Daniel Barkalow. Bugs are mine ;-) Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-05-05	Fix git-resolve-script.	Linus Torvalds	1	-1/+1
	I'd stupidly forgotten one merge_head -> merge conversion, and all my tests were for the fast-forward case that never triggered the bug.
2005-05-05	Split "git-pull-script" into two parts	Linus Torvalds	1	-0/+56
	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.