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

	Commit message (Expand)	Author	Age	Files	Lines
*	merge: don't leak the index during reloadsethomson/issue-4203	Edward Thomson	2018-10-20	1	-3/+4
*	merge: add error handling for index reload	Etiene Dalcol	2017-11-11	1	-3/+4
*	tests: add test case for index reloads on merge	Etiene Dalcol	2017-11-11	1	-0/+29
*	merge: reload index before git_merge	Greg Collinge	2017-11-11	1	-0/+3
*	Merge pull request #4403 from hkleynhans/select_bundled_zlib	Edward Thomson	2017-11-11	2	-12/+17
\|\
\| *	cmake: Allow user to select bundled zlib	Henry Kleynhans	2017-11-11	2	-12/+17
\|/
*	Merge pull request #4308 from pks-t/pks/header-state-machine	Edward Thomson	2017-11-11	2	-46/+103
\|\
\| *	patch_parse: fix parsing patches only containing exact renames	Patrick Steinhardt	2017-09-01	2	-0/+22
\| *	patch_parse: implement state machine for parsing patch headers	Patrick Steinhardt	2017-08-25	1	-46/+81
* \|	Merge pull request #4401 from ktdreyer/describe-h-spelling	Edward Thomson	2017-11-10	1	-1/+1
\|\ \
\| * \|	describe.h: fix spelling in comments	Ken Dreyer	2017-11-10	1	-1/+1
\|/ /
* \|	Merge pull request #4283 from tiennou/generic-tls	Patrick Steinhardt	2017-11-09	23	-109/+207
\|\ \
\| * \|	cmake: move Darwin-specific block around	Etienne Samson	2017-10-23	2	-15/+12
\| * \|	cmake: Add USE_HTTPS as a CMake option	Etienne Samson	2017-10-23	3	-30/+57
\| * \|	cmake: braces are not needed here	Etienne Samson	2017-10-23	1	-2/+2
\| * \|	cmake: use FeatureSummary to display which features we end up using	Etienne Samson	2017-10-23	2	-0/+24
\| * \|	cmake: make our macOS helpers more CMake-y	Etienne Samson	2017-10-23	3	-28/+58
\| * \|	cmake: fix indentation before enhancing	Etienne Samson	2017-10-23	2	-12/+12
\| * \|	https: correct some error messages	Etienne Samson	2017-10-23	1	-2/+2
\| * \|	clar: exit immediately on initialization failure	Etienne Samson	2017-10-23	1	-1/+6
\| * \|	https: Prevent OpenSSL from namespace-leaking	Etienne Samson	2017-10-23	4	-10/+23
\| * \|	stream: Gather streams to src/streams	Etienne Samson	2017-10-23	16	-29/+32
\| * \|	cmake: simplify some HTTPS tests	Etienne Samson	2017-10-23	2	-3/+2
* \| \|	Merge pull request #4394 from libgit2/cmn/macos-ramdisk	Edward Thomson	2017-11-06	1	-0/+9
\|\ \ \
\| * \| \|	travis: let's try a 5GB ramdiskcmn/macos-ramdisk	Carlos Martín Nieto	2017-10-31	1	-2/+2
\| * \| \|	travis: put clar's sandbox in a ramdisk on macOS	Carlos Martín Nieto	2017-10-31	1	-0/+9
* \| \| \|	Merge pull request #4397 from pks-t/pks/appveyor-examples	Edward Thomson	2017-11-06	3	-4/+41
\|\ \ \ \
\| * \| \| \|	examples: network: fix Win32 linking errors due to getline	Patrick Steinhardt	2017-11-06	1	-2/+39
\| * \| \| \|	appveyor: build examples	Patrick Steinhardt	2017-11-06	2	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #4386 from novalis/gitignore-ignore-space	Carlos Martín Nieto	2017-11-04	2	-0/+20
\|\ \ \ \
\| * \| \| \|	Ignore trailing whitespace in .gitignore files (as git itself does)	David Turner	2017-10-29	2	-0/+20
* \| \| \| \|	CHANGELOG: add note about supporting conditional includes	Carlos Martín Nieto	2017-11-04	1	-0/+2
* \| \| \| \|	Merge pull request #4332 from pks-t/pks/conditional-includes	Carlos Martín Nieto	2017-11-04	17	-113/+359
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/master' into pks/conditional-includes	Carlos Martín Nieto	2017-11-04	17	-187/+649
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #4393 from libgit2/ethomson/pgpkey	Carlos Martín Nieto	2017-10-31	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	travis: grab pgp key from www.edwardthomson.com	Edward Thomson	2017-10-30	1	-1/+1
* \| \| \| \| \|	Merge pull request #4392 from libgit2/cmn/config-write-preserve-case	Carlos Martín Nieto	2017-10-31	3	-9/+47
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	config: check for OOM when writingcmn/config-write-preserve-case	Carlos Martín Nieto	2017-10-30	1	-0/+2
\| * \| \| \| \|	CHANGELOG: add note about config writing changes	Carlos Martín Nieto	2017-10-30	1	-0/+4
\| * \| \| \| \|	config: preserve the original case when writing out new sections and vars	Carlos Martín Nieto	2017-10-30	1	-9/+18
\| * \| \| \| \|	config: add failing test for preserving case when writing keys	Carlos Martín Nieto	2017-10-30	1	-0/+23
\|/ / / / /
* \| \| \| \|	Merge pull request #4373 from cjhoward92/examples/log-show-log-size	Carlos Martín Nieto	2017-10-29	2	-7/+10
\|\ \ \ \ \
\| * \| \| \| \|	examples: log: pass options pointer to print_commit	Carson Howard	2017-10-13	1	-7/+7
\| * \| \| \| \|	PROJECTS: remove example for --log-size	Carson Howard	2017-10-11	1	-4/+0
\| * \| \| \| \|	example-log: add support for --log-size	Carson Howard	2017-10-11	1	-4/+11
* \| \| \| \| \|	Merge pull request #3944 from mhagger/diff-indent-heuristic	Carlos Martín Nieto	2017-10-29	2	-78/+523
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into diff-indent-heuristic	Carlos Martín Nieto	2017-10-29	552	-4452/+15648
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Introduce a new `XDL_INLINE` macro and use it instead of `inline`	Michael Haggerty	2017-10-14	1	-3/+8
\| * \| \| \| \| \| \|	xdiff: rename "struct group" to "struct xdlgroup"	Jeff King	2016-10-03	1	-7/+7
\| * \| \| \| \| \| \|	diff: improve positioning of add/delete blocks in diffs	Michael Haggerty	2016-09-29	2	-0/+327