Edward Thomson fef5344c50 merge::workdir::dirty: tick idx to defeat racy-git		2015-06-16 16:39:13 -04:00
..
analysis.c	s/git_merge_head/git_annotated_commit	2014-10-26 22:59:48 -04:00
dirty.c	merge::workdir::dirty: tick idx to defeat racy-git	2015-06-16 16:39:13 -04:00
renames.c	Renamed git_merge_options 'flags' to 'tree_flags'	2015-03-16 09:53:27 +02:00
setup.c	merge: lock the index at the start of the merge	2015-02-14 09:25:35 -05:00
simple.c	reset: remove reflog message override	2015-03-03 14:40:50 +01:00
submodules.c	reset: remove reflog message override	2015-03-03 14:40:50 +01:00
trivial.c	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00