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
..
sys	transport: provide a way to get the callbacks	2015-08-19 02:23:18 +02:00
annotated_commit.h	annotated_commit: provide a constructor from a revspec	2015-03-16 16:57:30 +01:00
attr.h	Documentation fixes	2014-07-08 10:30:19 +02:00
blame.h	doc: add documentation to all the public structs and enums	2014-12-06 03:44:40 +01:00
blob.h	blob: don't recomment using git_buf_grow	2015-06-24 23:49:10 +02:00
branch.h	Add annotated commit versions of reflog-modifying functions	2015-03-16 16:57:30 +01:00
buffer.h	Spelling fixes	2014-12-04 21:06:59 -06:00
checkout.h	checkout: better document the baseline_index opt	2015-05-11 14:13:31 -04:00
cherrypick.h	Use correct Doxygen trailing comment syntax	2015-02-10 12:44:05 -07:00
clone.h	Remove the callbacks struct from the remote	2015-05-13 09:46:35 +02:00
commit.h	commit: allow retrieving an arbitrary header field	2015-06-22 15:56:31 +02:00
common.h	doc: add documentation to all the public structs and enums	2014-12-06 03:44:40 +01:00
config.h	config: correct documentation for non-existent config file	2015-09-03 11:38:21 +02:00
cred_helpers.h	Escape @ in doc comment	2015-08-29 17:46:34 -06:00
describe.h	Add const qualifier	2015-05-15 00:34:43 +03:00
diff.h	iterator: better document GIT_DIFF_DISABLE_PATHSPEC_MATCH	2015-08-31 19:41:43 -04:00
errors.h	Make giterr_detach no longer public	2015-08-03 15:23:17 +01:00
filter.h	filter: add docs for streaming filters	2015-07-03 14:36:41 +02:00
global.h	init: return the number of initializations	2014-12-04 20:42:27 -05:00
graph.h	Add git_graph_descendant_of.	2014-01-28 19:39:14 +01:00
ignore.h	update copyrights	2013-01-08 17:31:27 -06:00
index.h	index: also try conflict mode when inserting	2015-09-30 09:06:09 -04:00
indexer.h	Don't redefine the same callback types, their signatures may change	2014-04-21 11:28:49 +02:00
inttypes.h	Unify whitespaces to tabs	2013-05-15 20:26:55 +08:00
merge.h	Update documentation for API changes	2015-04-30 10:59:50 -04:00
message.h	message: don't assume the comment char	2014-05-18 10:06:49 +02:00
net.h	doc: add documentation to all the public structs and enums	2014-12-06 03:44:40 +01:00
notes.h	note: use a git_buf to return the default namespace	2015-03-17 20:50:02 +01:00
object.h	peel: reject bad queries with EINVALIDSPEC	2014-11-22 18:55:22 +01:00
odb_backend.h	odb: make the writestream's size a git_off_t	2015-05-13 09:34:20 +02:00
odb.h	odb: make the writestream's size a git_off_t	2015-05-13 09:34:20 +02:00
oid.h	Fix doc comment formatting	2015-02-10 08:31:48 -07:00
oidarray.h	merge: expose multiple merge bases	2014-07-27 17:17:22 +02:00
pack.h	packbuilder: introduce git_packbuilder_insert_recur()	2015-03-17 20:51:14 +01:00
patch.h	diff docs: update git_diff_delta description	2015-02-03 13:41:35 -05:00
pathspec.h	pathspec: use C guards in header	2014-06-10 03:53:26 +02:00
rebase.h	rebase: correct documentation, CHANGELOG	2015-04-20 17:22:39 -04:00
refdb.h	Move git_reference__alloc to include/git2/sys	2013-04-21 12:52:17 -07:00
reflog.h	reflog: constify byindex	2014-09-30 15:44:32 +02:00
refs.h	Remove the signature from ref-modifying functions	2015-03-03 14:40:50 +01:00
refspec.h	refspec: move to git_buf for outputting strings	2014-01-27 04:44:06 +01:00
remote.h	Document git_fetch_options struct and fix typo.	2015-07-20 09:48:01 -04:00
repository.h	Fix @param names in doc comments	2015-07-27 14:46:50 -06:00
reset.h	Add a missing include for reset	2015-05-20 21:06:01 +02:00
revert.h	Use correct Doxygen trailing comment syntax	2015-02-10 12:44:05 -07:00
revparse.h	Some documentation improvements	2013-08-28 09:31:32 -07:00
revwalk.h	revwalk: reword the push text	2015-04-13 18:03:03 +02:00
signature.h	Fixed miscellaneous documentation errors.	2014-05-23 15:57:20 +08:00
stash.h	stash_apply: provide progress callbacks	2015-05-11 14:12:42 -04:00
status.h	diff/status: introduce conflicts	2015-05-28 09:44:02 -04:00
stdint.h	msvc: Properly handle inttypes.h/stdint.h	2011-10-05 16:21:16 -04:00
strarray.h	Unify whitespaces to tabs	2013-05-15 20:26:55 +08:00
submodule.h	submodule: completely remove reload_all	2015-07-01 17:49:07 +02:00
tag.h	tag: Introduce git_tag_annotation_create()	2013-05-21 19:32:59 +02:00
trace.h	Remove trace / add git_diff_perfdata struct + api	2014-05-02 09:21:33 -07:00
transaction.h	transaction: rename lock() to lock_ref()	2014-10-09 16:29:30 +02:00
transport.h	cred: add a free function wrapper	2015-08-19 02:23:18 +02:00
tree.h	treebuilder: rename _create() to _new()	2014-12-27 12:09:11 +00:00
types.h	Rename FALLBACK to UNSPECIFIED	2015-06-25 12:48:44 +02:00
version.h	Bump version to 0.23.0 and SOVERSION to 23	2015-06-28 14:53:30 +02:00