diff --git a/types/nodegit/cherry-pick.d.ts b/types/nodegit/cherry-pick.d.ts new file mode 100644 index 0000000000..333831a29b --- /dev/null +++ b/types/nodegit/cherry-pick.d.ts @@ -0,0 +1,9 @@ +import { Repository } from './repository'; +import { Commit } from './commit'; +import { MergeOptions } from './merge-options'; + +export class Cherrypick { + static cherrypick(repo: Repository, commit: Commit, options?: CherrypickOptions): Promise; + static commit(repo: Repository, cherrypickCommit: Commit, ourCommit: Commit, mainline: number, mergeOptions?: MergeOptions): Promise; + static initOptions(opts: CherrypickOptions, version: number): number; +} diff --git a/types/nodegit/index.d.ts b/types/nodegit/index.d.ts index 9b446aa056..30e306c5a9 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 { Cherrypick } from './cherry-pick'; export { CloneOptions } from './clone-options'; export { Clone } from './clone'; export { Commit } from './commit'; diff --git a/types/nodegit/tsconfig.json b/types/nodegit/tsconfig.json index 02fa864776..5fd6456c5e 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.d.ts", "clone-options.d.ts", "clone.d.ts", "commit.d.ts",