From 45e2febe28d41e587bbde6aaf9a21f85ca8981d9 Mon Sep 17 00:00:00 2001
From: Dolan <dolan_miu@hotmail.com>
Date: Thu, 8 Jun 2017 00:39:50 +0100
Subject: [PATCH] Added CherrypickOptions

---
 types/nodegit/cherry-pick-options.d.ts | 9 +++++++++
 types/nodegit/index.d.ts               | 1 +
 types/nodegit/tsconfig.json            | 1 +
 3 files changed, 11 insertions(+)
 create mode 100644 types/nodegit/cherry-pick-options.d.ts

diff --git a/types/nodegit/cherry-pick-options.d.ts b/types/nodegit/cherry-pick-options.d.ts
new file mode 100644
index 0000000000..7c6ec6976c
--- /dev/null
+++ b/types/nodegit/cherry-pick-options.d.ts
@@ -0,0 +1,9 @@
+import { MergeOptions } from './merge-options';
+import { CheckoutOptions } from './checkout-options';
+
+export interface CherrypickOptions {
+    version: number;
+    mainline: number;
+    mergeOpts: MergeOptions;
+    checkoutOpts: CheckoutOptions;
+}
diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts
index 30e306c5a9..6fea8d24f3 100644
--- a/types/nodegit/index.d.ts
+++ b/types/nodegit/index.d.ts
@@ -16,6 +16,7 @@ export { CertX509 } from './cert-x509';
 export { Cert } from './cert';
 export { CheckoutOptions } from './checkout-options';
 export { Checkout } from './checkout';
+export { CherrypickOptions } from './cherry-pick-options';
 export { Cherrypick } from './cherry-pick';
 export { CloneOptions } from './clone-options';
 export { Clone } from './clone';
diff --git a/types/nodegit/tsconfig.json b/types/nodegit/tsconfig.json
index 5fd6456c5e..e1239f9251 100644
--- a/types/nodegit/tsconfig.json
+++ b/types/nodegit/tsconfig.json
@@ -29,6 +29,7 @@
         "cert.d.ts",
         "checkout-options.d.ts",
         "checkout.d.ts",
+        "cherry-pick-options.d.ts",
         "cherry-pick.d.ts",
         "clone-options.d.ts",
         "clone.d.ts",