tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2010-03-20	checkout --conflict=diff3: add a label for ancestor	Jonathan Nieder	2	-3/+3
2010-03-20	ll_merge(): add ancestor label parameter for diff3-style output	Jonathan Nieder	6	-15/+17
2010-03-20	merge-file --diff3: add a label for ancestor	Jonathan Nieder	2	-2/+3
2010-03-20	xdl_merge(): move file1 and file2 labels to xmparam structure	Jonathan Nieder	4	-13/+20
2010-03-20	xdl_merge(): add optional ancestor label to diff3-style output	Jonathan Nieder	2	-2/+15
2010-03-20	tests: document cherry-pick behavior in face of conflicts	Jonathan Nieder	1	-0/+198
2010-03-20	tests: document format of conflicts from checkout -m	Jonathan Nieder	1	-4/+61
2010-03-20	Update draft release notes to 1.7.1	Junio C Hamano	1	-2/+34
2010-03-20	Merge branch 'jk/maint-add-ignored-dir'	Junio C Hamano	3	-4/+103
2010-03-20	Merge branch 'ml/color-grep'	Junio C Hamano	6	-43/+123
2010-03-20	Merge branch 'jc/color-attrs'	Junio C Hamano	3	-14/+41
2010-03-20	Merge branch 'cc/reset-keep'	Junio C Hamano	5	-20/+229
2010-03-20	Merge branch 'fl/askpass'	Junio C Hamano	5	-13/+58
2010-03-20	Merge branch 'bg/apply-fix-blank-at-eof'	Junio C Hamano	4	-40/+450
2010-03-20	Merge branch 'bw/union-merge-refactor'	Junio C Hamano	6	-79/+92
2010-03-20	Merge branch 'maint'	Junio C Hamano	5	-9/+20
2010-03-20	Update draft release notes to 1.7.0.3	Junio C Hamano	1	-1/+7
2010-03-20	fetch: Fix minor memory leak	Andreas Gruenbacher	1	-2/+3
2010-03-20	fetch: Future-proof initialization of a refspec on stack	Andreas Gruenbacher	1	-3/+1
2010-03-20	fetch: Check for a "^{}" suffix with suffixcmp()	Andreas Gruenbacher	1	-1/+1
2010-03-20	Fix a spelling mistake in a git-p4 console message	Benjamin C Meyer	1	-1/+1
2010-03-20	Use test_expect_success for test setups	Brian Gernhardt	5	-61/+70
2010-03-20	daemon: parse_host_and_port SIGSEGV if port is specified	Imre Deak	1	-1/+1
2010-03-20	Makefile: Fix occasional GIT-CFLAGS breakage	Jonathan Nieder	1	-10/+11
2010-03-20	Makefile: Fix CDPATH problem	Jonathan Nieder	1	-0/+6
2010-03-20	notes.c: remove inappropriate call to return	Brandon Casey	1	-1/+1
2010-03-20	pull: replace unnecessary sed invocation	Stephen Boyd	1	-1/+1
2010-03-17	Merge branch 'maint'	Junio C Hamano	2	-2/+4
2010-03-17	Documentation: receive.denyCurrentBranch defaults to 'refuse'	Thomas Rast	1	-1/+1
2010-03-17	bash: complete *_HEAD refs if present	Ian Ward Comfort	1	-1/+3
2010-03-16	Merge branch 'maint'	Junio C Hamano	1	-22/+24
2010-03-15	Documentation/git-read-tree: clarify 2-tree merge	Michael J Gruber	1	-13/+15
2010-03-15	Documentation/git-read-tree: fix table layout	Michael J Gruber	1	-10/+10
2010-03-15	Merge branch 'sd/format-patch-to'	Junio C Hamano	5	-46/+197
2010-03-15	Merge branch 'tc/http-cleanup'	Junio C Hamano	8	-39/+66
2010-03-15	Merge branch 'tc/transport-verbosity'	Junio C Hamano	12	-41/+92
2010-03-15	Merge branch 'ld/push-porcelain'	Junio C Hamano	5	-9/+67
2010-03-15	Merge branch 'jh/notes'	Junio C Hamano	14	-196/+2167
2010-03-13	tests for "git add ignored-dir/file" without -f	Junio C Hamano	1	-0/+79
2010-03-13	dir: fix COLLECT_IGNORED on excluded prefixes	Jeff King	1	-2/+18
2010-03-13	t0050: mark non-working test as such	Junio C Hamano	1	-2/+6
2010-03-13	Merge branch 'maint'	Junio C Hamano	6	-14/+47
2010-03-13	don't use default revision if a rev was specified	Dave Olszewski	2	-2/+13
2010-03-13	for_each_recent_reflog_ent(): use strbuf, fix offset handling	René Scharfe	1	-10/+12
2010-03-13	t/Makefile: remove test artifacts upon "make clean"	Junio C Hamano	1	-0/+2
2010-03-13	blame: fix indent of line numbers	René Scharfe	2	-2/+20
2010-03-13	Merge git://git.bogomips.org/git-svn	Junio C Hamano	3	-2/+4
2010-03-13	t9150,t9151: Add rewrite-root option to init	Tuomas Suutari	2	-0/+2
2010-03-13	git-svn: Fix merge detecting with rewrite-root	Tuomas Suutari	1	-2/+2
2010-03-12	Merge branch 'maint'	Junio C Hamano	1	-12/+12