Edward Thomson 21515f228b index: also try conflict mode when inserting ... When we do not trust the on-disk mode, we use the mode of an existing index entry. This allows us to preserve executable bits on platforms that do not honor them on the filesystem. If there is no stage 0 index entry, also look at conflicts to attempt to answer this question: prefer the data from the 'ours' side, then the 'theirs' side before falling back to the common ancestor.		2015-09-30 09:06:09 -04:00
..
addall.c	win32: ensure hidden files can be staged	2015-08-03 18:33:15 -05:00
bypath.c	index: also try conflict mode when inserting	2015-09-30 09:06:09 -04:00
cache.c	Clean up some memory leaks	2014-10-26 22:27:44 -04:00
collision.c	conflict tests: use GIT_IDXENTRY_STAGE_SET	2015-05-28 09:44:22 -04:00
conflicts.c	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00
crlf.c	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
filemodes.c	index: add tests around case switching	2015-08-14 21:06:51 +02:00
inmemory.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
names.c	reset: remove reflog message override	2015-03-03 14:40:50 +01:00
racy.c	index test: include repository.h for decl	2015-06-29 21:23:09 +00:00
read_index.c	index: introduce git_index_read_index	2015-05-11 14:12:05 -04:00
read_tree.c	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
rename.c	Plug some leaks	2015-09-27 23:32:20 +02:00
reuc.c	reset: remove reflog message override	2015-03-03 14:40:50 +01:00
stage.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
tests.c	git_futils_mkdir_*: make a relative-to-base mkdir	2015-09-17 10:00:35 -04:00