tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2010-01-17	rerere: honor conflict-marker-size attribute	Junio C Hamano	3	-2/+20
2010-01-17	rerere: prepare for customizable conflict marker length	Junio C Hamano	1	-10/+44
2010-01-16	conflict-marker-size: new attribute	Junio C Hamano	1	-25/+34
2010-01-16	rerere: use ll_merge() instead of using xdl_merge()	Junio C Hamano	1	-4/+1
2010-01-16	merge-tree: use ll_merge() not xdl_merge()	Junio C Hamano	2	-11/+9
2010-01-16	xdl_merge(): allow passing down marker_size in xmparam_t	Junio C Hamano	2	-8/+18
2010-01-16	xdl_merge(): introduce xmparam_t for merge specific parameters	Junio C Hamano	6	-12/+17
2010-01-16	git_attr(): fix function signature	Junio C Hamano	9	-14/+19
2010-01-10	rerere forget path: forget recorded resolution	Junio C Hamano	4	-0/+161
2010-01-10	rerere: refactor rerere logic to make it independent from I/O	Junio C Hamano	1	-35/+76
2009-12-25	rerere: remove silly 1024-byte line limit	Junio C Hamano	1	-9/+10
2009-12-25	resolve-undo: teach "update-index --unresolve" to use resolve-undo info	Junio C Hamano	3	-1/+20
2009-12-25	resolve-undo: "checkout -m path" uses resolve-undo information	Junio C Hamano	5	-0/+77
2009-12-25	resolve-undo: allow plumbing to clear the information	Junio C Hamano	2	-0/+17
2009-12-25	resolve-undo: basic tests	Junio C Hamano	2	-1/+130
2009-12-25	resolve-undo: record resolved conflicts in a new index extension section	Junio C Hamano	8	-1/+160
2009-12-25	builtin-merge.c: use standard active_cache macros	Junio C Hamano	1	-3/+2
2009-12-23	Git 1.6.6	Junio C Hamano	3	-4/+6
2009-12-23	git svn: add test for a git svn gc followed by a git svn mkdirs	Robert Zeh	1	-0/+40
2009-12-23	git svn: branch/tag commands detect username in URLs	Eric Wong	1	-1/+2
2009-12-22	Merge branch 'maint'	Junio C Hamano	2	-3/+23
2009-12-22	git svn: lookup new parents correctly from svn:mergeinfo	Eric Wong	1	-1/+2
2009-12-22	Prevent git blame from segfaulting on a missing author name	David Reiss	2	-3/+23
2009-12-21	git-svn: Remove obsolete MAXPARENT check	Andrew Myrick	1	-6/+0
2009-12-21	git-svn: detect cherry-picks correctly.	Sam Vilain	2	-25/+66
2009-12-21	git-svn: exclude already merged tips using one rev-list call	Sam Vilain	1	-4/+48
2009-12-21	git-svn: fix some mistakes with interpreting SVN mergeinfo commit ranges	Sam Vilain	2	-10/+4
2009-12-21	git-svn: memoize conversion of SVN merge ticket info to git commit ranges	Sam Vilain	1	-37/+54
2009-12-21	git-svn: expand the svn mergeinfo test suite, highlighting some failures	Sam Vilain	3	-172/+860
2009-12-21	update release notes for git svn in 1.6.6	Eric Wong	1	-0/+2
2009-12-21	git svn: fix --revision when fetching deleted paths	Eric Wong	1	-1/+5
2009-12-20	Git 1.6.6-rc4	Junio C Hamano	2	-8/+9
2009-12-19	Merge branch 'maint'	Junio C Hamano	3	-5/+57
2009-12-19	rebase -i: abort cleanly if the editor fails to launch	Björn Gustavsson	1	-1/+1
2009-12-19	t9146: use 'svn_cmd' wrapper	Eric Wong	1	-1/+1
2009-12-19	git svn: make empty directory creation gc-aware	Eric Wong	2	-11/+58
2009-12-17	technical-docs: document hash API	Stephen Boyd	1	-2/+48
2009-12-17	api-strbuf.txt: fix typos and document launch_editor()	Stephen Boyd	1	-2/+8
2009-12-16	Git 1.6.6-rc3	Junio C Hamano	2	-7/+1
2009-12-16	Merge branch 'maint' to sync with 1.6.5.7	Junio C Hamano	10	-8/+91
2009-12-16	Git 1.6.5.7	Junio C Hamano	4	-3/+23
2009-12-16	worktree: don't segfault with an absolute pathspec without a work tree	Junio C Hamano	2	-2/+20
2009-12-16	ignore unknown color configuration	Jeff King	4	-3/+26
2009-12-15	help.autocorrect: do not run a command if the command given is junk	Johannes Sixt	1	-2/+5
2009-12-14	Illustrate "filter" attribute with an example	Nanako Shiraishi	1	-0/+19
2009-12-12	bash: Support new 'git fetch' options	Björn Gustavsson	1	-2/+12
2009-12-10	Update Release Notes for 1.6.6 to remove old bugfixes	Junio C Hamano	1	-16/+0
2009-12-10	Sync with 1.6.5.6	Junio C Hamano	7	-179/+37
2009-12-10	Git 1.6.5.6	Junio C Hamano	4	-3/+27
2009-12-10	Fix archive format with -- on the command line	Junio C Hamano	1	-6/+10