diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-09-29 15:49:16 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-09-30 09:06:09 -0400 |
| commit | 21515f228b739a3ecd2237bafbba50e8d219d8dd (patch) | |
| tree | edfbd52eee693f03e4e5248b05c74d45e48fa02d /include/git2/notes.h | |
| parent | 10df661b8cd2a7e4751f8344633825dfc88be169 (diff) | |
| download | libgit2-21515f228b739a3ecd2237bafbba50e8d219d8dd.tar.gz | |
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.
Diffstat (limited to 'include/git2/notes.h')
0 files changed, 0 insertions, 0 deletions