delta/libgit2.git/src/status.c, branch cmn/error-buffer

diff/status: introduce conflicts

2015-05-28T13:44:02+00:00

When diffing against an index, return a new `GIT_DELTA_CONFLICTED`
delta type for items that are conflicted.  For a single file path,
only one delta will be produced (despite the fact that there are
multiple entries in the index).

Index iterators now have the (optional) ability to return conflicts
in the index.  Prior to this change, they would be omitted, and callers
(like diff) would omit conflicted index entries entirely.

git_status_file now takes an exact path

2014-11-07T19:34:54+00:00

This function has one output but can match multiple files, which can be
unexpected for the user, which would usually path the exact path of the
file he wants the status of.

Remove debug printfs.

2014-07-22T01:25:56+00:00

GIT_DIFF_INCLUDE_UNREADABLE_AS_UNTRACKED

2014-06-04T00:50:00+00:00

Add GIT_STATUS_OPT_INCLUDE_UNREADABLE

2014-05-30T23:21:49+00:00

Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.

2014-05-20T13:57:40+00:00

Skip unreadable files for now.

2014-05-20T08:16:04+00:00

Fix remaining init_options inconsistencies

2014-05-02T16:21:33+00:00

There were a couple of "init_opts()" functions a few more cases
of structure initialization that I somehow missed.

Make init_options fns use unsigned ints and macro

2014-05-02T16:21:33+00:00

Use an unsigned int for the version and add a helper macro so the
code is simplified (and so the error message is a common string).

Remove trace / add git_diff_perfdata struct + api

2014-05-02T16:21:33+00:00