delta/libgit2.git/include/git2, branch cmn/init-ssh github.com: libgit2/libgit2.git Merge pull request #3597 from ethomson/filter_registration 2016-02-19T12:06:51+00:00 Carlos Martín Nieto carlosmn@github.com 2016-02-19T12:06:51+00:00 78e16c3442b57f967c31e65cfb4792dcf184c6e8 Filter registration 
Filter registration
 commit: expose the different kinds of errors 2016-02-16T13:06:48+00:00 Carlos Martín Nieto cmn@dwim.me 2016-02-16T13:06:48+00:00 eadd0f05f6faf14f94876839f00981da5d642667 We should be checking whether the object we're looking up is a commit, and we should let the caller know whether the not-found return code comes from a bad object type or just a missing signature. 
We should be checking whether the object we're looking up is a commit,
and we should let the caller know whether the not-found return code
comes from a bad object type or just a missing signature.
rebase: persist a single in-memory index 2016-02-15T19:27:06+00:00 Edward Thomson ethomson@github.com 2016-02-15T17:16:00+00:00 f28bae0c380467409515ffd25247f3204dcc4019 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. 
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.
rebase: allow custom merge_options 2016-02-11T18:49:25+00:00 Edward Thomson ethomson@github.com 2016-02-11T18:11:21+00:00 a202e0d45bcfd672cf1ff75abc192e6a592874ba Allow callers of rebase to specify custom merge options. This may allow custom conflict resolution, or failing fast when conflicts are detected. 
Allow callers of rebase to specify custom merge options.  This may
allow custom conflict resolution, or failing fast when conflicts
are detected.
rebase: introduce inmemory rebasing 2016-02-11T18:48:48+00:00 Edward Thomson ethomson@github.com 2016-02-11T18:48:48+00:00 ee6673070a6134f0a1743c866583b14a305b6a43 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. 
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.
filter: clean up documentation around custom filters 2016-02-10T05:47:51+00:00 Edward Thomson ethomson@github.com 2016-02-07T21:35:16+00:00 82abd40d80a8912043dd072a09962f06df193e36 






Merge pull request #3599 from libgit2/gpgsign
2016-02-09T15:26:58+00:00

Vicent Marti
vicent@github.com

2016-02-09T15:26:58+00:00

488e2b85053a45dd2ce6a37b7d5cf70870be5ed8

Introduce git_commit_extract_signature




Introduce git_commit_extract_signature






Introduce git_commit_extract_signature
2016-02-09T14:58:16+00:00

Carlos Martín Nieto
cmn@dwim.me

2016-02-08T17:51:13+00:00

a65afb757e2675eb8889a9ce1f8809434cdb3af7

This returns the GPG signature for a commit and its contents without the
signature block, allowing for the verification of the commit's
signature.





This returns the GPG signature for a commit and its contents without the
signature block, allowing for the verification of the commit's
signature.







Better document `git_merge_commits` redux
2016-02-09T01:56:41+00:00

Edward Thomson
ethomson@github.com

2016-02-09T01:55:22+00:00

b00c959f45bfa8e2bb27bec0cfebc4bad5f70df2

`git_merge_commits` and `git_merge` now *do* handle recursive base
building for criss-cross merges.  Remove the documentation that says
that they do not.

This reverts commit 5e44d9bcb6d5b20922f49b1913723186f8ced8b5.





`git_merge_commits` and `git_merge` now *do* handle recursive base
building for criss-cross merges.  Remove the documentation that says
that they do not.

This reverts commit 5e44d9bcb6d5b20922f49b1913723186f8ced8b5.







Merge pull request #3584 from jbreeden/export_fn
2016-02-05T00:43:23+00:00

Edward Thomson
ethomson@github.com

2016-02-05T00:43:23+00:00

45165b120865b37901933f1c5aa72e14e1114fe9

Export git_stash_apply_init_options




Export git_stash_apply_init_options