delta/libgit2.git - github.com: libgit2/libgit2.git

	Commit message (Expand)	Author	Age	Files	Lines
*	merge: virtual commit should be last argument to merge-baseethomson/recursive	Tyrie Vella	2018-02-04	1	-2/+8
*	Add failing test case for virtual commit merge base issue	Edward Thomson	2018-02-04	27	-0/+32
*	merge::trees::recursive: test for virtual base building	Edward Thomson	2018-02-04	1	-0/+25
*	merge: reverse merge bases for recursive merge	Edward Thomson	2018-02-04	4	-28/+32
*	oidarray: introduce git_oidarray__reverse	Edward Thomson	2018-02-04	2	-0/+13
*	Introduce additional criss-cross merge branches	Edward Thomson	2018-02-04	68	-0/+11
*	Merge pull request #4489 from libgit2/ethomson/conflicts_crlf	Edward Thomson	2018-02-04	17	-133/+326
\|\
\| *	merge: test CR/LF conflicts for CR/LF filesethomson/conflicts_crlf	Edward Thomson	2018-01-21	1	-0/+48
\| *	xdiff: upgrade to git's included xdiff	Edward Thomson	2018-01-21	16	-133/+278
* \|	Merge pull request #4499 from pks-t/pks/setuid-config	Edward Thomson	2018-02-02	1	-7/+74
\|\ \
\| * \|	sysdir: do not use environment in setuid case	Patrick Steinhardt	2018-02-02	1	-7/+74
\| \|/
* \|	Merge pull request #4512 from libgit2/ethomson/header_guards	Edward Thomson	2018-02-02	48	-86/+92
\|\ \
\| * \|	consistent header guardsethomson/header_guards	Edward Thomson	2018-02-01	48	-86/+92
* \| \|	Merge pull request #4510 from pks-t/pks/attr-file-bare-stat	Edward Thomson	2018-02-02	2	-4/+20
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	attr: avoid stat'ting files for bare repositories	Patrick Steinhardt	2018-02-01	2	-4/+20
* \| \|	Merge pull request #4040 from tiennou/examples/merge	Patrick Steinhardt	2018-02-01	7	-36/+447
\|\ \ \
\| * \| \|	examples: zero out our options memory before use	Etienne Samson	2018-01-25	1	-0/+2
\| * \| \|	examples: our/their can be NULL	Etienne Samson	2018-01-25	1	-2/+4
\| * \| \|	examples: fix remaining review comments	Etienne Samson	2018-01-25	1	-0/+2
\| * \| \|	examples: move support code into static functions	Etienne Samson	2018-01-25	1	-81/+97
\| * \| \|	examples: hoist the merge analysis back into main	Etienne Samson	2018-01-25	1	-58/+39
\| * \| \|	examples: minor review fixups	Etienne Samson	2018-01-25	1	-10/+12
\| * \| \|	examples: add merge	Etienne Samson	2018-01-25	1	-0/+391
\| * \| \|	examples: Dead code & warnings	Etienne Samson	2018-01-25	1	-7/+0
\| * \| \|	examples: Move xrealloc to common example code	Etienne Samson	2018-01-25	3	-10/+15
\| * \| \|	examples: Switch to the nifty argv helpers from common	Etienne Samson	2018-01-25	2	-19/+36
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #4507 from tomas/patch-1	Edward Thomson	2018-01-31	1	-2/+7
\|\ \ \
\| * \| \|	Set ctime/mtime nanosecs to 0 if USE_NSEC is not defined	Tomás Pollak	2018-01-31	1	-0/+3
\| * \| \|	Honor 'GIT_USE_NSEC' option in `filesystem_iterator_set_current`	Tomás Pollak	2018-01-30	1	-2/+4
* \| \| \|	Merge pull request #4488 from libgit2/ethomson/conflict_marker_size	Edward Thomson	2018-01-31	7	-8/+23
\|\ \ \ \
\| * \| \| \|	CHANGELOG: include merge_file conflict marker sizeethomson/conflict_marker_size	Edward Thomson	2018-01-21	1	-0/+6
\| * \| \| \|	merge: recursive uses larger conflict markers	Edward Thomson	2018-01-21	4	-8/+9
\| * \| \| \|	merge: allow custom conflict marker size	Edward Thomson	2018-01-21	2	-0/+8
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #4490 from libgit2/ethomson/apfs_precompose_fixes	Edward Thomson	2018-01-31	1	-1/+7
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|
\| * \| \|	status::renames: write NFD instead of NFC filenameethomson/apfs_precompose_fixes	Edward Thomson	2018-01-21	1	-1/+7
\| \|/ /
* \| \|	Merge pull request #4474 from pks-t/pks/null-oid	Edward Thomson	2018-01-29	4	-1/+60
\|\ \ \
\| * \| \|	odb: reject reading and writing null OIDs	Patrick Steinhardt	2018-01-26	2	-1/+43
\| * \| \|	tree: reject writing null-OID entries to a tree	Patrick Steinhardt	2018-01-26	2	-0/+17
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #4502 from pks-t/pks/security-reporting	Edward Thomson	2018-01-29	1	-0/+6
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	README.md: add notes on how to report security issues	Patrick Steinhardt	2018-01-29	1	-0/+6
\|/ /
* \|	Merge pull request #4497 from medranocalvo/export-mempack	Patrick Steinhardt	2018-01-25	2	-4/+6
\|\ \ \| \|/ \|/\|
\| *	odb: export mempack backend	Adrián Medraño Calvo	2018-01-22	2	-4/+6
\|/
*	Merge pull request #4484 from pks-t/pks/fail-creating-branch-HEAD	Edward Thomson	2018-01-20	1	-0/+6
\|\
\| *	branch: refuse creating branches named 'HEAD'	Patrick Steinhardt	2018-01-19	1	-0/+6
* \|	Merge pull request #4478 from libgit2/cmn/packed-refs-sorted	Edward Thomson	2018-01-20	1	-1/+1
\|\ \
\| * \|	refs: include " sorted " in our packed-refs headercmn/packed-refs-sorted	Carlos Martín Nieto	2018-01-12	1	-1/+1
* \| \|	Merge pull request #4483 from libgit2/cmn/prettify-docs	Edward Thomson	2018-01-20	1	-3/+2
\|\ \ \
\| * \| \|	message: update docs for git_message_prettifycmn/prettify-docs	Carlos Martín Nieto	2018-01-19	1	-3/+2
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #4481 from pks-t/pks/tests-online-clone-url-memleak	Carlos Martín Nieto	2018-01-19	1	-0/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	tests: online::clone: fix memory leak due to not freeing URL	Patrick Steinhardt	2018-01-18	1	-0/+2
\|/ /