tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2005-09-22	Prettyprint octopus merge message.	Junio C Hamano	1	-7/+2
	Including the current branch in the list of heads being merged was not a good idea, so drop it. And shorten the message by grouping branches and tags together to form a single line. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-21	Revert "Use git-merge instead of git-resolve in git-pull."	Junio C Hamano	1	-33/+7
	This reverts f887564ab72e107bcdee3ba83c91e2bb4ae13ca7 commit.
2005-09-21	Revert "Make Octopus merge message a bit nicer."	Junio C Hamano	1	-76/+5
	This reverts 63f1aa6c72c46928f1b6959437aed4becbc42ff3 commit.
2005-09-20	Make Octopus merge message a bit nicer.	Junio C Hamano	1	-5/+76
	Linus says that 'of .' to mean the commits came from the local repository was too confusing and ugly -- I tend to agree with him. Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-20	Use git-merge instead of git-resolve in git-pull.	Junio C Hamano	1	-7/+33
	Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-15	Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.	Junio C Hamano	1	-1/+1
	Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-13	Make merge comment git-pull makes for an octopus a bit prettier.	Junio C Hamano	1	-3/+5
	Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-07	Big tool rename.	Junio C Hamano	1	-0/+44
	As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>