tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2010-03-21	Documentation/urls: Remove spurious example markers	Michael J Gruber	1	-6/+0
2010-03-21	Documentation/gitdiffcore: Remove misleading date in heading	Michael J Gruber	1	-1/+1
2010-03-21	Documentation/git-reflog: Fix formatting of command lists	Michael J Gruber	1	-2/+0
2010-03-21	rev-list: fix --pretty=oneline with empty message	Erik Faye-Lund	2	-1/+13
2010-03-20	merge-recursive: add a label for ancestor	Jonathan Nieder	1	-0/+1
2010-03-20	cherry-pick, revert: add a label for ancestor	Jonathan Nieder	2	-3/+6
2010-03-20	revert: clarify label on conflict hunks	Jonathan Nieder	2	-41/+64
2010-03-20	compat: add mempcpy()	Jonathan Nieder	1	-0/+9
2010-03-20	checkout -m --conflict=diff3: add a label for ancestor	Jonathan Nieder	2	-1/+2
2010-03-20	merge_trees(): add ancestor label parameter for diff3-style output	Jonathan Nieder	2	-3/+9
2010-03-20	merge_file(): add comment explaining behavior wrt conflict style	Jonathan Nieder	1	-0/+6
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	.mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela	Michael J Gruber	1	-0/+3
2010-03-20	revert: fix tiny memory leak in cherry-pick --ff	Jonathan Nieder	1	-1/+2
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	rebase -i: use new --ff cherry-pick option	Christian Couder	1	-12/+3
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	Modernize git calling conventions in hook templates	Ben Walton	7	-17/+17
2010-03-20	Make templates honour SHELL_PATH and PERL_PATH	Ben Walton	4	-6/+19
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	t/t5505-remote.sh: escape * to prevent interpretation by shell as glob	Brandon Casey	1	-1/+1
2010-03-20	t5505: add missing &&	Brandon Casey	1	-1/+1
2010-03-20	t5505: remove unnecessary subshell invocations	Brandon Casey	1	-39/+4
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-20	gitk: Fix display of copyright symbol	Pat Thoyts	9	-17/+17
2010-03-20	gitk: Add emacs editor variable block	Pat Thoyts	1	-0/+6
2010-03-20	gitk: Avoid calling tk_setPalette on Windows	Pat Thoyts	1	-0/+1
2010-03-20	gitk: Don't clobber "Remember this view" setting	Jonathan Nieder	1	-2/+2