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

	Commit message (Expand)	Author	Age	Files	Lines
*	index: overwrite the path when inserting conflictsntk/case_index_conflicts	Carlos Martín Nieto	2015-11-12	2	-5/+6
*	index: correctly report which conflict stage has a wrong filemode	Carlos Martín Nieto	2015-11-12	1	-1/+1
*	Failing test for case sensitive conflicts in the index	nulltoken	2015-11-12	1	-0/+91
*	Merge pull request #3498 from ethomson/windows_symlinks	Carlos Martín Nieto	2015-11-08	3	-0/+115
\|\
\| *	index: test that add_bypath preserves symlinks	Edward Thomson	2015-11-03	1	-0/+29
\| *	diff: on win32, treat fake "symlinks" specially	Edward Thomson	2015-11-03	1	-0/+25
\| *	diff: test "symlinks" in wd are respected on win32	Edward Thomson	2015-11-03	1	-0/+61
* \|	Merge pull request #3500 from ethomson/submodules_with_path	Carlos Martín Nieto	2015-11-08	16	-24/+95
\|\ \
\| * \|	submodule: reload HEAD/index after reading config	Edward Thomson	2015-11-04	1	-24/+18
\| * \|	submodule: test updating a submodule w/ a path	Edward Thomson	2015-11-04	15	-0/+77
* \| \|	Merge pull request #3465 from libgit2/cmn/tls-register	Edward Thomson	2015-11-04	5	-0/+81
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	stream: allow registering a user-provided TLS constructorcmn/tls-register	Carlos Martín Nieto	2015-11-03	4	-0/+78
\| * \|	stream: accept NULL in the free function	Carlos Martín Nieto	2015-11-03	1	-0/+3
* \| \|	Merge branch 'pr/3487'	Edward Thomson	2015-11-03	3	-13/+32
\|\ \ \
\| * \| \|	Fix git_commit_summary to convert newlines to spaces even after	Stjepan Rajko	2015-11-03	3	-13/+32
\|/ / /
* \| \|	Merge pull request #3494 from leoyanggit/fix_unit_test_build	Carlos Martín Nieto	2015-11-03	1	-2/+13
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Fix build for unit test	Leo Yang	2015-11-02	1	-2/+13
* \| \|	Merge branch 'pr/3147'	Edward Thomson	2015-11-02	5	-9/+74
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add diff progress callback.	Jason Haslam	2015-11-02	5	-9/+74
\|/ /
* \|	Merge pull request #3491 from libgit2/cmn/config-checksum	Edward Thomson	2015-11-02	4	-36/+59
\|\ \
\| * \|	filebuf: use an internal buffercmn/config-checksum	Carlos Martín Nieto	2015-10-30	1	-6/+10
\| * \|	filebuf: use a checksum to detect file changes	Carlos Martín Nieto	2015-10-30	3	-34/+33
\| * \|	config: add failing test for an external modification	Carlos Martín Nieto	2015-10-30	1	-0/+20
* \| \|	Merge pull request #3495 from leoyanggit/fix_transport_build	Edward Thomson	2015-11-02	1	-0/+1
\|\ \ \
\| * \| \|	Fix build for custom transport users	Leo Yang	2015-10-30	1	-0/+1
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #3492 from libgit2/vmg/redundant	Vicent Marti	2015-11-02	10	-22/+202
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	merge: Fix memory leak in testvmg/redundant	Vicent Marti	2015-11-02	1	-0/+1
\| * \|	Add test case	Vicent Marti	2015-11-02	8	-0/+30
\| * \|	merge-base: Style	Vicent Marti	2015-11-02	1	-1/+6
\| * \|	merge-base: Do not read parents from the root	Vicent Marti	2015-11-02	1	-1/+1
\| * \|	merge-base: Remove redundant merge bases	Vicent Marti	2015-11-02	2	-22/+166
\|/ /
* \|	Merge pull request #3493 from ethomson/read_index	Carlos Martín Nieto	2015-10-30	1	-9/+29
\|\ \ \| \|/ \|/\|
\| *	index: read_index must update hashes	Edward Thomson	2015-10-30	1	-9/+29
* \|	git: put NULL check at the top	Carlos Martín Nieto	2015-10-30	1	-2/+5
\|/
*	git: accept NULL as argument to its stream free	Carlos Martín Nieto	2015-10-30	1	-2/+2
*	Merge pull request #3486 from srajko/reflog-segfault-fix	Carlos Martín Nieto	2015-10-29	2	-1/+44
\|\
\| *	Prevent segfault when parsing a reflog with oid parse error	Stjepan Rajko	2015-10-29	2	-1/+44
* \|	pool: fix documentation	Edward Thomson	2015-10-28	1	-2/+2
* \|	Merge pull request #3488 from libgit2/vmg/pool	Vicent Marti	2015-10-28	19	-354/+102
\|\ \
\| * \|	merge: Do not mallocz unecessary entriesvmg/pool	Vicent Marti	2015-10-28	1	-2/+2
\| * \|	pool: update comment	Vicent Marti	2015-10-28	1	-1/+1
\| * \|	pool: Dot not assume mallocs are zeroed out	Vicent Marti	2015-10-28	4	-24/+23
\| * \|	pool: Handle 32 bit systems	Vicent Marti	2015-10-28	1	-1/+1
\| * \|	pool: Take into account malloc overhead & pool page size	Vicent Marti	2015-10-28	1	-1/+2
\| * \|	repository: plug memory leak	Vicent Marti	2015-10-28	1	-0/+1
\| * \|	pool: Simplify implementation	Vicent Marti	2015-10-28	17	-336/+83
\|/ /
* \|	Merge pull request #3489 from libgit2/vmg/reuc-insert	Vicent Marti	2015-10-28	3	-49/+66
\|\ \
\| * \|	merge: Plug memory leakvmg/reuc-insert	Vicent Marti	2015-10-27	1	-3/+3
\| * \|	merge: Implement `GIT_MERGE_TREE_SKIP_REUC`	Vicent Marti	2015-10-27	2	-28/+48
\| * \|	reuc: Be smarter when inserting new REUC entries	Vicent Marti	2015-10-27	1	-19/+16
\|/ /