tgif.git - Terin's Improved Git Fork

Age	Commit message (Collapse)	Author	Files	Lines
2006-05-07	Sparse fix for builtin-diff	Peter Hagervall	1	-2/+1
	You gotta love sparse: builtin-diff.c:88:4: error: Just how const do you want this type to be? Signed-off-by: Peter Hagervall <hager@cs.umu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-03	Merge branch 'jc/diff'	Junio C Hamano	1	-0/+369
	* jc/diff: builtin-diff: call it "git-diff", really. builtin-diff.c: die() formatting type fix. built-in diff: assorted updates. built-in diff.
2006-04-30	builtin-diff.c: die() formatting type fix.	Junio C Hamano	1	-1/+1
	Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-29	built-in diff: assorted updates.	Junio C Hamano	1	-9/+46
	"git diff(n)" without --base, --ours, etc. defaults to --cc, which usually is the same as -p unless you are in the middle of a conflicted merge, just like the shell script version. "git diff(n) blobA blobB path" complains and dies. "git diff(n) tree0 tree1 tree2...treeN" does combined diff that shows a merge of tree1..treeN to result in tree0. Giving "-c" option to any command that defaults to "--cc" turns off dense-combined flag. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-04-28	built-in diff.	Junio C Hamano	1	-0/+332
	This starts to replace the shell script version of "git diff". Signed-off-by: Junio C Hamano <junkio@cox.net>