delta/libgit2.git/include/git2/status.h, branch cmn/error-buffer github.com: libgit2/libgit2.git diff/status: introduce conflicts 2015-05-28T13:44:02+00:00 Edward Thomson ethomson@microsoft.com 2015-05-14T18:00:29+00:00 7c948014006e86beaced3e77b61cb0a8ddb0958c 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. 
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 Ungureanu Marius marius.ungureanu@xamarin.com 2014-11-07T18:32:50+00:00 68182085694d76b97eb747960195917df69500c8 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. 
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.
Whitespace wibbles. 2014-06-04T22:41:48+00:00 Alan Rogers alan@github.com 2014-06-04T22:41:48+00:00 9e2d2f30deab2cad3d2cc6dbd5f498668d18572f 






Add GIT_STATUS_OPT_INCLUDE_UNREADABLE_AS_UNTRACKED
2014-06-04T00:42:52+00:00

Alan Rogers
alan@github.com

2014-06-04T00:42:52+00:00

79d5b5c91683720c9055d1f5ea3f9468ca9356a4

and a (failing) test for it.





and a (failing) test for it.







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

Alan Rogers
alan@github.com

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

66271925a118040eac4d18230cfa88461c1e3788












Start adding GIT_DELTA_UNREADABLE and GIT_STATUS_WT_UNREADABLE.
2014-05-20T13:57:40+00:00

Alan Rogers
alan@github.com

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

61bef72dc35c593e632dc2008c4eec271a264869












Remove trace / add git_diff_perfdata struct + api
2014-05-02T16:21:33+00:00

Russell Belfer
rb@github.com

2014-04-29T22:05:58+00:00

9c8ed4999740e921ecc2966bbcd0dbcfc725f59a












Add GIT_STATUS_OPT_UPDATE_INDEX and use trace API
2014-05-02T16:21:33+00:00

Russell Belfer
rb@github.com

2014-04-28T23:39:53+00:00

cd424ad5518c7cfbba10a764d7bc097377ec3995

This adds an option to refresh the stat cache while generating
status.  It also rips out the GIT_PERF stuff I had an makes use
of the trace API to keep statistics about what happens during diff.





This adds an option to refresh the stat cache while generating
status.  It also rips out the GIT_PERF stuff I had an makes use
of the trace API to keep statistics about what happens during diff.







Improve docs for status rename detection limits
2014-04-24T22:40:50+00:00

Russell Belfer
rb@github.com

2014-04-24T22:40:50+00:00

6b833e3a4a29d76e25120cf374838404a6b68825

and make tests empty on platforms without iconv support.





and make tests empty on platforms without iconv support.







Added function-based initializers for every options struct.
2014-03-06T02:49:23+00:00

Matthew Bowen
matthew@mgbowen.com

2014-03-06T02:49:23+00:00

b9f819978c571cc806827e8b3ebc1a58a0755999

The basic structure of each function is courtesy of arrbee.





The basic structure of each function is courtesy of arrbee.