diff options
| author | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
|---|---|---|
| committer | Ben Straub <bs@github.com> | 2013-10-03 06:20:20 -0700 |
| commit | fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc (patch) | |
| tree | 1446cb018eb05571b4eff101ceae937688e83a1d /include/git2.h | |
| parent | de8fe729efd350ae5cb1ef25ffb08f92c6f706b9 (diff) | |
| parent | ab1368766240cfe861729642abe1cddd01c0203e (diff) | |
| download | libgit2-fc1f7d4f15ecc3f42dbde7fc0a30933cb89152bc.tar.gz | |
Merge branch 'development' into blame
Conflicts:
include/git2.h
Diffstat (limited to 'include/git2.h')
| -rw-r--r-- | include/git2.h | 83 |
1 files changed, 38 insertions, 45 deletions
diff --git a/include/git2.h b/include/git2.h index 7bcb9c9cd..f1f124e63 100644 --- a/include/git2.h +++ b/include/git2.h @@ -8,58 +8,51 @@ #ifndef INCLUDE_git_git_h__ #define INCLUDE_git_git_h__ -#include "git2/version.h" - -#include "git2/common.h" -#include "git2/threads.h" -#include "git2/errors.h" - -#include "git2/types.h" - -#include "git2/oid.h" -#include "git2/signature.h" -#include "git2/odb.h" - -#include "git2/repository.h" -#include "git2/revwalk.h" -#include "git2/merge.h" -#include "git2/graph.h" -#include "git2/refs.h" -#include "git2/reflog.h" -#include "git2/revparse.h" - -#include "git2/object.h" +#include "git2/attr.h" #include "git2/blob.h" +#include "git2/blame.h" +#include "git2/branch.h" +#include "git2/buffer.h" +#include "git2/checkout.h" +#include "git2/clone.h" #include "git2/commit.h" -#include "git2/tag.h" -#include "git2/tree.h" -#include "git2/diff.h" - -#include "git2/index.h" +#include "git2/common.h" #include "git2/config.h" -#include "git2/transport.h" -#include "git2/remote.h" -#include "git2/clone.h" -#include "git2/checkout.h" -#include "git2/push.h" - -#include "git2/attr.h" +#include "git2/diff.h" +#include "git2/errors.h" +#include "git2/filter.h" +#include "git2/graph.h" #include "git2/ignore.h" -#include "git2/branch.h" -#include "git2/refspec.h" -#include "git2/net.h" -#include "git2/status.h" +#include "git2/index.h" #include "git2/indexer.h" -#include "git2/submodule.h" -#include "git2/notes.h" -#include "git2/reset.h" +#include "git2/merge.h" #include "git2/message.h" +#include "git2/net.h" +#include "git2/notes.h" +#include "git2/object.h" +#include "git2/odb.h" +#include "git2/oid.h" #include "git2/pack.h" -#include "git2/stash.h" #include "git2/pathspec.h" -#include "git2/blame.h" - -#include "git2/buffer.h" -#include "git2/filter.h" +#include "git2/push.h" +#include "git2/refdb.h" +#include "git2/reflog.h" +#include "git2/refs.h" +#include "git2/refspec.h" +#include "git2/remote.h" +#include "git2/repository.h" +#include "git2/reset.h" +#include "git2/revparse.h" +#include "git2/revwalk.h" +#include "git2/signature.h" +#include "git2/stash.h" +#include "git2/status.h" +#include "git2/submodule.h" +#include "git2/tag.h" +#include "git2/threads.h" +#include "git2/transport.h" +#include "git2/tree.h" +#include "git2/types.h" +#include "git2/version.h" #endif |