Edward Thomson 9f545b9d71 introduce git_index_entry_is_conflict ... It's not always obvious the mapping between stage level and conflict-ness. More importantly, this can lead otherwise sane people to write constructs like `if (!git_index_entry_stage(entry))`, which (while technically correct) is unreadable. Provide a nice method to help avoid such messy thinking.		2015-05-28 09:47:31 -04:00
..
sys	Merge pull request #3118 from libgit2/cmn/stream-size	2015-05-13 12:11:55 -04:00
annotated_commit.h	annotated_commit: provide a constructor from a revspec	2015-03-16 16:57:30 +01:00
attr.h
blame.h	doc: add documentation to all the public structs and enums	2014-12-06 03:44:40 +01:00
blob.h
branch.h	Add annotated commit versions of reflog-modifying functions	2015-03-16 16:57:30 +01:00
buffer.h
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
common.h	doc: add documentation to all the public structs and enums	2014-12-06 03:44:40 +01:00
config.h	config: borrow refcounted references	2015-03-03 18:35:12 +01:00
cred_helpers.h
describe.h	Fix doc comment formatting	2015-02-10 08:31:48 -07:00
diff.h	diff/status: introduce conflicts	2015-05-28 09:44:02 -04:00
errors.h	errors: add GIT_EEOF to indicate early EOF	2015-05-20 15:08:39 +02:00
filter.h	git_filter_opt_t -> git_filter_flag_t	2015-02-19 11:09:54 -05:00
global.h
graph.h
ignore.h
index.h	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00
indexer.h
inttypes.h
merge.h	Update documentation for API changes	2015-04-30 10:59:50 -04:00
message.h
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
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
rebase.h	rebase: correct documentation, CHANGELOG	2015-04-20 17:22:39 -04:00
refdb.h
reflog.h
refs.h	Remove the signature from ref-modifying functions	2015-03-03 14:40:50 +01:00
refspec.h
remote.h	Fix error when building as C++.	2015-05-20 14:26:05 -06:00
repository.h	Add annotated commit versions of reflog-modifying functions	2015-03-16 16:57:30 +01: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
revwalk.h	revwalk: reword the push text	2015-04-13 18:03:03 +02:00
signature.h
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
strarray.h
submodule.h	Remove the callbacks struct from the remote	2015-05-13 09:46:35 +02:00
tag.h
trace.h
transaction.h
transport.h	remote: move the transport ctor to the callbacks	2015-05-13 09:46:36 +02:00
tree.h	treebuilder: rename _create() to _new()	2014-12-27 12:09:11 +00:00
types.h	remote: move the transport ctor to the callbacks	2015-05-13 09:46:36 +02:00
version.h	win32: add the patch level to the .dll fileversion	2015-03-02 10:35:26 -05:00