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

	Commit message (Expand)	Author	Age	Files	Lines
*	refactor: `tests` is now `tests/libgit2`	Edward Thomson	2022-02-22	1	-778/+0
*	Merge pull request #6197 from libgit2/ethomson/merge_msg_conflict_comment	Edward Thomson	2022-02-02	1	-2/+2
\|\
\| *	merge: comment conflicts lines in MERGE_MSG	Edward Thomson	2022-01-30	1	-2/+2
* \|	merge: support zdiff3 conflict styles	Edward Thomson	2022-01-30	1	-0/+78
\|/
*	path: separate git-specific path functions from util	Edward Thomson	2021-11-09	1	-1/+1
*	str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstr	Edward Thomson	2021-10-17	1	-19/+18
*	fileops: rename to "futils.h" to match function signatures	Patrick Steinhardt	2019-07-20	1	-1/+1
*	Merge branch 'issue-4203'	Edward Thomson	2018-10-20	1	-0/+29
\|\
\| *	tests: add test case for index reloads on merge	Etiene Dalcol	2017-11-11	1	-0/+29
* \|	treewide: remove use of C++ style comments	Patrick Steinhardt	2018-07-13	1	-1/+1
* \|	Convert usage of `git_buf_free` to new `git_buf_dispose`	Patrick Steinhardt	2018-06-10	1	-9/+9
\|/
*	Fix rebase bug and include test for merge=union	Stan Hu	2016-03-17	1	-0/+36
*	merge tests: move expected data into own file	Edward Thomson	2015-11-25	1	-0/+1
*	reset: remove reflog message override	Carlos Martín Nieto	2015-03-03	1	-2/+2
*	Remove the signature from ref-modifying functions	Carlos Martín Nieto	2015-03-03	1	-3/+3
*	Fix broken merge tests due to autocrlf was not false	Linquize	2014-12-07	1	-0/+8
*	s/git_merge_head/git_annotated_commit	Edward Thomson	2014-10-26	1	-20/+20
*	Allow to propagate checkout callbacks to git HARD reset	Sven Strickroth	2014-08-03	1	-2/+2
*	merge: checkout default shouldn't clobber given	Edward Thomson	2014-04-23	1	-2/+4
*	Capture conflict information in MERGE_MSG for revert and merge	Jacques Germishuys	2014-04-14	1	-1/+9
*	Remove `git_merge_result` as it's now unnecessary	Edward Thomson	2014-03-20	1	-69/+16
*	Update git_merge_tree_opts to git_merge_options	Edward Thomson	2014-03-20	1	-4/+4
*	Change signature of `git_merge` to take merge and checkout opts	Edward Thomson	2014-03-20	1	-15/+15
*	Introduce git_merge_file for consumers	Edward Thomson	2014-03-20	1	-41/+0
*	Prevent user's merge.conflictstyle from breaking tests	Ben Straub	2014-02-05	1	-0/+7
*	Add reflog parameters to git_reset	Ben Straub	2014-02-03	1	-2/+2
*	merge: rename _oid() -> id()	Carlos Martín Nieto	2014-01-25	1	-5/+5
*	index: rename an entry's id to 'id'	Carlos Martín Nieto	2014-01-25	1	-1/+1
*	Support union merges	Edward Thomson	2014-01-20	1	-0/+43
*	Load merge.conflictstyle setting from config	Edward Thomson	2014-01-20	1	-0/+86
*	Introduce diff3 mode for checking out conflicts	Edward Thomson	2014-01-20	1	-1/+48
*	Don't try to merge binary files	Edward Thomson	2014-01-20	1	-0/+37
*	merge_file should use more aggressive levels	Edward Thomson	2014-01-20	1	-7/+7
*	refs: remove the _with_log differentiation	Carlos Martín Nieto	2014-01-15	1	-1/+1
*	Rename tests-clar to tests	Ben Straub	2013-11-14	1	-0/+491