tgif.git - Terin's Improved Git Fork

Age	Commit message (Expand)	Author	Files	Lines
2017-10-26	Merge branch 'mh/ref-locking-fix'	Junio C Hamano	1	-0/+141
2017-10-25	files_transaction_prepare(): fix handling of ref lock failure	Michael Haggerty	1	-8/+8
2017-10-25	t1404: add a bunch of tests of D/F conflicts	Michael Haggerty	1	-0/+141
2017-10-18	Merge branch 'jk/ref-filter-colors-fix'	Junio C Hamano	3	-5/+26
2017-10-17	tag: respect color.ui config	Jeff King	2	-0/+11
2017-10-17	Revert "color: check color.ui in git_default_config()"	Jeff King	1	-1/+1
2017-10-17	Revert "t6006: drop "always" color config tests"	Jeff King	1	-5/+15
2017-10-17	Revert "color: make "always" the same as "auto" in config"	Jeff King	1	-1/+1
2017-10-17	Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...	Junio C Hamano	12	-79/+70
2017-10-17	Merge branch 'sb/diff-color-move'	Junio C Hamano	1	-0/+9
2017-10-16	diff: fix infinite loop with --color-moved --ignore-space-change	Jeff King	1	-0/+9
2017-10-11	Merge branch 'sb/test-cmp-expect-actual'	Junio C Hamano	14	-41/+41
2017-10-11	Merge branch 'jk/refs-df-conflict'	Junio C Hamano	3	-2/+36
2017-10-11	Merge branch 'rs/fsck-null-return-from-lookup'	Junio C Hamano	1	-0/+22
2017-10-11	Merge branch 'tb/show-trailers-in-ref-filter'	Junio C Hamano	2	-3/+89
2017-10-07	Merge branch 'tb/ref-filter-empty-modifier'	Junio C Hamano	1	-0/+1
2017-10-07	Merge branch 'jk/ui-color-always-to-auto'	Junio C Hamano	13	-94/+85
2017-10-07	Merge branch 'rs/qsort-s'	Junio C Hamano	1	-1/+1
2017-10-07	Merge branch 'tb/delimit-pretty-trailers-args-with-comma'	Junio C Hamano	1	-2/+2
2017-10-07	tests: fix diff order arguments in test_cmp	Stefan Beller	15	-42/+42
2017-10-07	refs_resolve_ref_unsafe: handle d/f conflicts for writes	Jeff King	2	-1/+35
2017-10-07	t3308: create a real ref directory/file conflict	Jeff King	1	-1/+1
2017-10-06	fsck: handle NULL return of lookup_blob() and lookup_tree()	René Scharfe	1	-0/+22
2017-10-05	Merge branch 'ar/request-pull-phrasofix'	Junio C Hamano	1	-2/+2
2017-10-05	Merge branch 'er/fast-import-dump-refs-on-checkpoint'	Junio C Hamano	1	-0/+142
2017-10-05	ref-filter.c: pass empty-string as NULL to atom parsers	Taylor Blau	1	-0/+1
2017-10-04	test-stringlist: avoid buffer underrun when sorting nothing	René Scharfe	1	-1/+1
2017-10-04	Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-auto	Junio C Hamano	13	-80/+71
2017-10-04	t7301: use test_terminal to check color	Jeff King	1	-2/+3
2017-10-04	t4015: use --color with --color-moved	Jeff King	1	-13/+12
2017-10-04	color: make "always" the same as "auto" in config	Jeff King	1	-0/+10
2017-10-04	provide --color option for all ref-filter users	Jeff King	2	-4/+4
2017-10-04	t3205: use --color instead of color.branch=always	Jeff King	1	-3/+2
2017-10-04	t3203: drop "always" color test	Jeff King	1	-6/+0
2017-10-04	t6006: drop "always" color config tests	Jeff King	1	-15/+5
2017-10-04	t7502: use diff.noprefix for --verbose test	Jeff King	1	-2/+2
2017-10-04	t7508: use test_terminal for color output	Jeff King	1	-20/+21
2017-10-04	t3701: use test-terminal to collect color output	Jeff King	1	-5/+3
2017-10-04	t4015: prefer --color to -c color.diff=always	Jeff King	1	-14/+14
2017-10-04	test-terminal: set TERM=vt100	Jeff King	7	-10/+9
2017-10-03	Merge branch 'mr/doc-negative-pathspec'	Junio C Hamano	1	-1/+12
2017-10-03	Merge branch 'sb/submodule-diff-header-fix'	Junio C Hamano	1	-1/+1
2017-10-03	Merge branch 'sb/diff-color-move'	Junio C Hamano	6	-0/+34
2017-10-03	Merge branch 'sb/test-submodule-update-config'	Junio C Hamano	1	-0/+8
2017-10-03	Merge branch 'jk/no-optional-locks'	Junio C Hamano	1	-0/+10
2017-10-03	Merge branch 'sd/branch-copy'	Junio C Hamano	1	-0/+256
2017-10-03	Merge branch 'bc/rev-parse-parseopt-fix'	Junio C Hamano	3	-3/+113
2017-10-03	Merge branch 'js/rebase-i-final'	Junio C Hamano	2	-19/+31
2017-10-03	request-pull: capitalise "Git" to make it a proper noun	Ann T Ropea	1	-2/+2
2017-10-02	ref-filter.c: parse trailers arguments with %(contents) atom	Taylor Blau	1	-0/+38