rhi/git -

	Commit message (Expand)	Author	Age	Files	Lines
*	merge.c: remove implicit dependency on the_index	Nguyễn Thái Ngọc Duy	2018-09-21	1	-9/+11
*	Merge branch 'en/dirty-merge-fixes'	Junio C Hamano	2018-08-02	1	-31/+0
\|\
\| *	read-cache.c: move index_has_changes() from merge.c	Elijah Newren	2018-07-03	1	-31/+0
* \|	Merge branch 'ma/unpack-trees-free-msgs'	Junio C Hamano	2018-05-30	1	-15/+20
\|\ \
\| * \|	unpack_trees_options: free messages when done	Martin Ågren	2018-05-22	1	-0/+3
\| * \|	merge: setup `opts` later in `checkout_fast_forward()`	Martin Ågren	2018-05-21	1	-15/+17
\| \|/
* /	merge: convert empty tree constant to the_hash_algo	brian m. carlson	2018-05-02	1	-4/+1
\|/
*	merge: always roll back lock in `checkout_fast_forward()`	Martin Ågren	2018-02-28	1	-3/+9
*	Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with...	Junio C Hamano	2017-12-22	1	-0/+33
\|\
\| *	move index_has_changes() from builtin/am.c to merge.c for reuse	Elijah Newren	2017-12-22	1	-0/+33
* \|	read-cache: leave lock in right state in `write_locked_index()`	Martin Ågren	2017-10-07	1	-3/+1
* \|	treewide: prefer lockfiles on the stack	Martin Ågren	2017-10-06	1	-4/+4
\|/
*	tree: convert parse_tree_indirect to struct object_id	brian m. carlson	2017-05-08	1	-2/+2
*	merge: convert checkout_fast_forward to struct object_id	brian m. carlson	2017-05-08	1	-4/+4
*	lockfile: LOCK_REPORT_ON_ERROR	Junio C Hamano	2016-12-07	1	-1/+1
*	sequencer: lib'ify checkout_fast_forward()	Johannes Schindelin	2016-09-09	1	-3/+6
*	Convert struct object to object_id	brian m. carlson	2015-11-20	1	-1/+1
*	lockfile.h: extract new header file for the functions in lockfile.c	Michael Haggerty	2014-10-01	1	-0/+1
*	Merge branch 'nd/split-index'	Junio C Hamano	2014-07-16	1	-4/+3
\|\
\| *	read-cache: new API write_locked_index instead of write_index/write_cache	Nguyễn Thái Ngọc Duy	2014-06-13	1	-4/+3
* \|	merge: use argv_array when spawning merge strategy	Jeff King	2014-06-19	1	-29/+13
\|/
*	Move try_merge_command and checkout_fast_forward to libgit.a	Nguyễn Thái Ngọc Duy	2012-10-29	1	-0/+112