<feed xmlns='http://www.w3.org/2005/Atom'>
<title>delta/libgit2.git/include/git2/rebase.h, branch ethomson/callback_names</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>rebase: orig_head and onto accessors</title>
<updated>2019-04-21T20:04:08+00:00</updated>
<author>
<name>Erik Aigner</name>
<email>aigner.erik@gmail.com</email>
</author>
<published>2019-04-21T19:36:36+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=e215f47579432e0d0597cdcafab2fafa2e37ca46'/>
<id>e215f47579432e0d0597cdcafab2fafa2e37ca46</id>
<content type='text'>
The rebase struct stores fields with information about the current
rebase process, which were not accessible via a public interface.

Accessors for getting the `orig_head` and `onto` branch
names and object ids have been added.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
The rebase struct stores fields with information about the current
rebase process, which were not accessible via a public interface.

Accessors for getting the `orig_head` and `onto` branch
names and object ids have been added.
</pre>
</div>
</content>
</entry>
<entry>
<title>docs: standardize comment block for git_*_init_options functions</title>
<updated>2018-05-07T19:50:38+00:00</updated>
<author>
<name>Etienne Samson</name>
<email>samson.etienne@gmail.com</email>
</author>
<published>2018-03-22T22:27:27+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=ca5a15e51b361691087c92eb391411607d867f4b'/>
<id>ca5a15e51b361691087c92eb391411607d867f4b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>docs: fix more missing includes</title>
<updated>2018-05-07T19:50:15+00:00</updated>
<author>
<name>Etienne Samson</name>
<email>samson.etienne@gmail.com</email>
</author>
<published>2018-03-22T22:27:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=96576372fd2dd89edc5939f87c72907aa2d92909'/>
<id>96576372fd2dd89edc5939f87c72907aa2d92909</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix a few checkout -&gt; rebase typos</title>
<updated>2016-02-22T14:41:01+00:00</updated>
<author>
<name>Carlos Martín Nieto</name>
<email>cmn@dwim.me</email>
</author>
<published>2016-02-22T14:41:01+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=88ab3be6f52a6711d63266a296b6d569dc299019'/>
<id>88ab3be6f52a6711d63266a296b6d569dc299019</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: persist a single in-memory index</title>
<updated>2016-02-15T19:27:06+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-02-15T17:16:00+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=f28bae0c380467409515ffd25247f3204dcc4019'/>
<id>f28bae0c380467409515ffd25247f3204dcc4019</id>
<content type='text'>
When performing an in-memory rebase, keep a single index for the
duration, so that callers have the expected index lifecycle and
do not hold on to an index that is free'd out from under them.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
When performing an in-memory rebase, keep a single index for the
duration, so that callers have the expected index lifecycle and
do not hold on to an index that is free'd out from under them.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: allow custom merge_options</title>
<updated>2016-02-11T18:49:25+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-02-11T18:11:21+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=a202e0d45bcfd672cf1ff75abc192e6a592874ba'/>
<id>a202e0d45bcfd672cf1ff75abc192e6a592874ba</id>
<content type='text'>
Allow callers of rebase to specify custom merge options.  This may
allow custom conflict resolution, or failing fast when conflicts
are detected.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Allow callers of rebase to specify custom merge options.  This may
allow custom conflict resolution, or failing fast when conflicts
are detected.
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: introduce inmemory rebasing</title>
<updated>2016-02-11T18:48:48+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@github.com</email>
</author>
<published>2016-02-11T18:48:48+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=ee6673070a6134f0a1743c866583b14a305b6a43'/>
<id>ee6673070a6134f0a1743c866583b14a305b6a43</id>
<content type='text'>
Introduce the ability to rebase in-memory or in a bare repository.

When `rebase_options.inmemory` is specified, the resultant `git_rebase`
session will not be persisted to disk.  Callers may still analyze
the rebase operations, resolve any conflicts against the in-memory
index and create the commits.  Neither `HEAD` nor the working
directory will be updated during this process.
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Introduce the ability to rebase in-memory or in a bare repository.

When `rebase_options.inmemory` is specified, the resultant `git_rebase`
session will not be persisted to disk.  Callers may still analyze
the rebase operations, resolve any conflicts against the in-memory
index and create the commits.  Neither `HEAD` nor the working
directory will be updated during this process.
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix a typo in documentation</title>
<updated>2016-02-03T22:27:04+00:00</updated>
<author>
<name>Nicolas Vanheuverzwijn</name>
<email>nicolas.vanheu@gmail.com</email>
</author>
<published>2016-02-03T22:27:04+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=1087e6be88bd43be8ce46975258758af224171f9'/>
<id>1087e6be88bd43be8ce46975258758af224171f9</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: correct documentation, CHANGELOG</title>
<updated>2015-04-20T21:22:39+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@microsoft.com</email>
</author>
<published>2015-04-20T21:22:39+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=aa9bb425a951565663cf15e23e41b00ac46bf1a5'/>
<id>aa9bb425a951565663cf15e23e41b00ac46bf1a5</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>rebase: include checkout opts within rebase opts</title>
<updated>2015-04-20T21:19:08+00:00</updated>
<author>
<name>Edward Thomson</name>
<email>ethomson@microsoft.com</email>
</author>
<published>2015-04-20T21:19:08+00:00</published>
<link rel='alternate' type='text/html' href='http://git.baserock.org/cgit/delta/libgit2.git/commit/?id=94c988f6d6f4930ee4c120f6ce7932b5e49637be'/>
<id>94c988f6d6f4930ee4c120f6ce7932b5e49637be</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
