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

	Commit message (Expand)	Author	Age	Files	Lines
*	tree: use a specialised mode parse functioncmn/parse-mode	Carlos Martín Nieto	2015-12-02	1	-5/+21
*	Merge pull request #3527 from pks-t/pks/tree-entry-memleak	Edward Thomson	2015-12-01	1	-0/+2
\|\
\| *	tree: mark cloned tree entries as un-pooled	Patrick Steinhardt	2015-12-01	1	-0/+2
\|/
*	Merge pull request #3508 from libgit2/cmn/tree-parse-speed	Edward Thomson	2015-11-30	2	-17/+55
\|\
\| *	tree: ensure the entry filename fits in 16 bitscmn/tree-parse-speed	Carlos Martín Nieto	2015-11-30	1	-16/+26
\| *	tree: make path len uint16_t and avoid holes	Carlos Martín Nieto	2015-11-28	2	-2/+2
\| *	tree: calculate the filename length once	Carlos Martín Nieto	2015-11-28	1	-5/+8
\| *	tree: pool the entry memory allocations	Carlos Martín Nieto	2015-11-28	2	-6/+33
\| *	tree: avoid advancing over the filename multiple times	Carlos Martín Nieto	2015-11-28	1	-4/+2
* \|	Merge pull request #3525 from pks-t/pks/fix-nested-struct-warning	Carlos Martín Nieto	2015-11-30	2	-3/+1
\|\ \
\| * \|	object: remove unused constant OBJECT_BASE_SIZE	Patrick Steinhardt	2015-11-30	1	-2/+0
\| * \|	tests: fix warning for nested struct initialization	Patrick Steinhardt	2015-11-30	1	-1/+1
\|/ /
* \|	Merge pull request #3513 from ethomson/merge_recursive	Carlos Martín Nieto	2015-11-30	175	-192/+1237
\|\ \ \| \|/ \|/\|
\| *	recursive merge: add a recursion limit	Edward Thomson	2015-11-25	3	-3/+49
\| *	merge: handle conflicts in recursive base building	Edward Thomson	2015-11-25	28	-20/+201
\| *	merge tests: add complex recursive example	Edward Thomson	2015-11-25	12	-6/+39
\| *	recursive: test conflict output during recursive merge	Edward Thomson	2015-11-25	2	-0/+81
\| *	merge tests: move expected data into own file	Edward Thomson	2015-11-25	6	-44/+47
\| *	merge: use annotated commits for recursion	Edward Thomson	2015-11-25	3	-68/+122
\| *	merge: merge annotated commits instead of regular commits	Edward Thomson	2015-11-25	3	-166/+159
\| *	merge: octopus merge common ancestors when >2	Edward Thomson	2015-11-25	3	-119/+189
\| *	merge: add recursive test with conflicting contents	Edward Thomson	2015-11-25	9	-0/+32
\| *	merge: compute octopus merge bases	Edward Thomson	2015-11-25	1	-89/+100
\| *	merge: add recursive test with three merge bases	Edward Thomson	2015-11-25	28	-0/+65
\| *	merge: improve test names in recursive merge tests	Edward Thomson	2015-11-25	1	-8/+8
\| *	merge: add a third-level recursive merge	Edward Thomson	2015-11-25	13	-0/+58
\| *	merge: add a second-level recursive merge	Edward Thomson	2015-11-25	12	-2/+57
\| *	merge: build virtual base of multiple merge bases	Edward Thomson	2015-11-25	1	-10/+123
\| *	merge: add simple recursive test	Edward Thomson	2015-11-25	71	-5/+245
\| *	merge: rename `git_merge_tree_flags_t` -> `git_merge_flags_t`	Edward Thomson	2015-11-25	9	-34/+44
* \|	Merge pull request #3523 from pks-t/memleak-fixes	Edward Thomson	2015-11-24	3	-1/+6
\|\ \
\| * \|	tests: win32::longpath: free expected_msg	Patrick Steinhardt	2015-11-24	1	-0/+2
\| * \|	tests: config::stress: free `git_config` structs	Patrick Steinhardt	2015-11-24	1	-0/+3
\| * \|	tests: config::global: fix memleak in open_programdata	Patrick Steinhardt	2015-11-24	1	-1/+1
* \| \|	Merge pull request #3520 from ethomson/checkout_nsecs	Carlos Martín Nieto	2015-11-24	5	-66/+46
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	checkout: only consider nsecs when built that way	Edward Thomson	2015-11-23	5	-66/+46
\|/ /
* \|	Merge pull request #3515 from jacquesg/unsigned-signed	Edward Thomson	2015-11-21	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Make stat.st_size a __int64 not a uint64_t	Jacques Germishuys	2015-11-21	1	-1/+1
* \|	Merge pull request #3517 from jacquesg/warnings-fixes	Edward Thomson	2015-11-20	4	-3/+3
\|\ \
\| * \|	Fix some warnings	Jacques Germishuys	2015-11-20	4	-3/+3
\| \|/
* \|	Merge pull request #3514 from jacquesg/stat-fixes	Edward Thomson	2015-11-20	2	-11/+24
\|\ \
\| * \|	Detect stat's structure	Jacques Germishuys	2015-11-20	2	-11/+24
\| \|/
* \|	Merge pull request #3516 from libgit2/cmn/repository-state-sequencer	Edward Thomson	2015-11-20	4	-3/+35
\|\ \ \| \|/ \|/\|
\| *	repository: distinguish sequencer cherry-pick and revertcmn/repository-state-sequencer	Carlos Martín Nieto	2015-11-20	4	-3/+35
\|/
*	Merge pull request #3511 from ethomson/racy_fixes_2	Carlos Martín Nieto	2015-11-17	3	-53/+286
\|\
\| *	racy: make git_index_read_index handle raciness	Edward Thomson	2015-11-16	2	-30/+96
\| *	racy: ensure git_index_read_tree clears uptodate	Edward Thomson	2015-11-16	1	-0/+28
\| *	index: clear uptodate bit on save	Edward Thomson	2015-11-16	1	-1/+16
\| *	index: test for smudged entries on write only	Edward Thomson	2015-11-16	1	-7/+35
\| *	checkout::crlf test: don't crash when no idx entry	Edward Thomson	2015-11-16	1	-4/+5