tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2009-08-26	Fix behaviour if you have a branch named the same as your --prefix	Avery Pennarun	1	-0/+1
	We were trying to 'git checkout $prefix', which is ambiguous if $prefix names a directory and a branch. Do 'git checkout -- $prefix' instead. The main place this appeared was in 'git subtree add'. Reported by several people.
2009-08-12	sort assertion to make it more generic	Amiel Martin	1	-1/+1

2009-08-12	fixed order of assertion in tests	Amiel Martin	1	-1/+1

2009-04-26	test.sh: oops, never intended to count the raw number of commits.	Avery Pennarun	1	-4/+3
	Just needed to make sure the count was non-zero.
2009-04-26	test.sh: make sure no commit changes more than one file at a time.	Avery Pennarun	1	-0/+34

2009-04-26	Trim some extra merge commits that don't need to go into the split tree.	Avery Pennarun	1	-15/+22
	...and update test.sh to test for this.
2009-04-26	test.sh tweak	Avery Pennarun	1	-1/+4

2009-04-26	Add some basic assertions to test.sh.	Avery Pennarun	1	-1/+72

2009-04-26	Add a 'create' helper function in test.sh.	Avery Pennarun	1	-15/+5

2009-04-26	Add --annotate option, and create recognizable file content during tests.	Avery Pennarun	1	-30/+37

2009-04-25	Change test.sh to test the new add, merge, and pull commands.	Avery Pennarun	1	-8/+4

2009-04-24	Pass the path using the --prefix option instead of on the command line.	Avery Pennarun	1	-3/+3
	I like this better. It's more like git-read-tree and some other commands.
2009-04-24	Okay, that was a little too aggressive.	Avery Pennarun	1	-1/+4
	Now we only prune out a commit if it has exactly one remaining parent and that parent's tree is identical to ours. But I also changed the test to create the initial "-s ours" merge in one step instead of two, and that merge can be eliminated since one of its parents doesn't affect the subdir at all, and is thus deleted.
2009-04-24	Even more aggressive commit trimming.	Avery Pennarun	1	-1/+1
	Now we cut out a commit if any of its parents had the same tree; just use that parent in its place. This makes the history look nice, but I don't think it's quite right...
2009-04-24	Quick test script for generating reasonably complex merge scenarios.	Avery Pennarun	1	-0/+96