<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/libgit2.git/include/git2/diff.h, branch cmn/url-empty</title>
<subtitle>github.com: libgit2/libgit2.git
</subtitle>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/'/>
<entry>
<title>diff: introduce binary diff callbacks</title>
<updated>2015-06-12T13:39:20+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@edwardthomson.com</email>
</author>
<published>2015-05-26T00:03:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=8147b1aff56c0f36f6afee9b8810fc74776e1f58'/>
<id>8147b1aff56c0f36f6afee9b8810fc74776e1f58</id>
<content type='text'>
Introduce a new binary diff callback to provide the actual binary
delta contents to callers.  Create this data from the diff contents
(instead of directly from the ODB) to support binary diffs including
the workdir, not just things coming out of the ODB.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Introduce a new binary diff callback to provide the actual binary
delta contents to callers.  Create this data from the diff contents
(instead of directly from the ODB) to support binary diffs including
the workdir, not just things coming out of the ODB.
</pre>
</div>
</content>
</entry>
<entry>
<title>Introduce `GIT_DIFF_FLAG_EXISTS`</title>
<updated>2015-05-28T13:47:47+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@microsoft.com</email>
</author>
<published>2015-05-19T22:26:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=10549a2df166cd3b951c65ab89c33f7ef21c6b7a'/>
<id>10549a2df166cd3b951c65ab89c33f7ef21c6b7a</id>
<content type='text'>
Mark the `old_file` and `new_file` sides of a delta with a new bit,
`GIT_DIFF_FLAG_EXISTS`, that introduces that a particular side of
the delta exists in the diff.

This is useful for indicating whether a working directory item exists
or not, in the presence of a conflict.  Diff users may have previously
used DELETED to determine this information.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Mark the `old_file` and `new_file` sides of a delta with a new bit,
`GIT_DIFF_FLAG_EXISTS`, that introduces that a particular side of
the delta exists in the diff.

This is useful for indicating whether a working directory item exists
or not, in the presence of a conflict.  Diff users may have previously
used DELETED to determine this information.
</pre>
</div>
</content>
</entry>
<entry>
<title>diff/status: introduce conflicts</title>
<updated>2015-05-28T13:44:02+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@microsoft.com</email>
</author>
<published>2015-05-14T18:00:29+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=7c948014006e86beaced3e77b61cb0a8ddb0958c'/>
<id>7c948014006e86beaced3e77b61cb0a8ddb0958c</id>
<content type='text'>
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.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
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.
</pre>
</div>
</content>
</entry>
<entry>
<title>checkout: break case-changes into delete/add</title>
<updated>2015-05-04T12:18:28+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@microsoft.com</email>
</author>
<published>2015-03-31T20:29:35+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=4beab1f8bbc29a0788ed7d5c1f6bc21741392565'/>
<id>4beab1f8bbc29a0788ed7d5c1f6bc21741392565</id>
<content type='text'>
When checking out with a case-insensitive working directory, we
want to change the case of items in the working directory to
reflect changes that occured in the checkout target.  Diff now
has an option to break case-changing renames into delete/add.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When checking out with a case-insensitive working directory, we
want to change the case of items in the working directory to
reflect changes that occured in the checkout target.  Diff now
has an option to break case-changing renames into delete/add.
</pre>
</div>
</content>
</entry>
<entry>
<title>diff docs: update `git_diff_delta` description</title>
<updated>2015-02-03T18:41:35+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@microsoft.com</email>
</author>
<published>2015-02-03T18:41:35+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=3538f8f131e8ebe597c1172b381bb260ac66f1c0'/>
<id>3538f8f131e8ebe597c1172b381bb260ac66f1c0</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf</title>
<updated>2014-10-27T16:17:01+00:00</updated>
<author>
<name>Pierre-Olivier Latour</name>
<email>pol@mac.com</email>
</author>
<published>2014-10-26T17:40:46+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=d88766c4e16c311ba8ce28e71a6545c5d0d7521f'/>
<id>d88766c4e16c311ba8ce28e71a6545c5d0d7521f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Update some documentation</title>
<updated>2014-10-18T13:22:19+00:00</updated>
<author>
<name>Carlos Martín Nieto</name>
<email>cmn@dwim.me</email>
</author>
<published>2014-10-17T20:22:59+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=12e1803188407e6ee18b9bd22186dd5d02c8ba78'/>
<id>12e1803188407e6ee18b9bd22186dd5d02c8ba78</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Join typedef and struct definitions in single file.</title>
<updated>2014-09-24T09:00:51+00:00</updated>
<author>
<name>Ciro Santilli</name>
<email>ciro.santilli@gmail.com</email>
</author>
<published>2014-09-18T09:53:24+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=062804570c3e25170b52f849da173f8266b5e33e'/>
<id>062804570c3e25170b52f849da173f8266b5e33e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Move the UNREADABLE enums to the correct group.</title>
<updated>2014-07-22T01:17:42+00:00</updated>
<author>
<name>Alan Rogers</name>
<email>alan@github.com</email>
</author>
<published>2014-07-22T01:15:33+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=35b1471f01c42c601804ef579a91778fceebbdab'/>
<id>35b1471f01c42c601804ef579a91778fceebbdab</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Merge remote-tracking branch 'origin/development' into fix-git-status-list-new-unreadable-folder</title>
<updated>2014-06-04T22:36:28+00:00</updated>
<author>
<name>Alan Rogers</name>
<email>alan@github.com</email>
</author>
<published>2014-06-04T22:36:28+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=dc49e1b5b368b4b7d5b8ae8a0a12027f86395cad'/>
<id>dc49e1b5b368b4b7d5b8ae8a0a12027f86395cad</id>
<content type='text'>
Conflicts:
	include/git2/diff.h
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Conflicts:
	include/git2/diff.h
</pre>
</div>
</content>
</entry>
</feed>
