git - git

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