mirror of
https://github.com/gosticks/DefinitelyTyped.git
synced 2026-08-12 04:50:18 +00:00
Documented Cherrypick
This commit is contained in:
+24
@@ -2,8 +2,32 @@ import { MergeOptions } from './merge-options';
|
||||
import { CheckoutOptions } from './checkout-options';
|
||||
|
||||
export interface CherrypickOptions {
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @type {number}
|
||||
* @memberof CherrypickOptions
|
||||
*/
|
||||
version: number;
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @type {number}
|
||||
* @memberof CherrypickOptions
|
||||
*/
|
||||
mainline: number;
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @type {MergeOptions}
|
||||
* @memberof CherrypickOptions
|
||||
*/
|
||||
mergeOpts: MergeOptions;
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @type {CheckoutOptions}
|
||||
* @memberof CherrypickOptions
|
||||
*/
|
||||
checkoutOpts: CheckoutOptions;
|
||||
}
|
||||
|
||||
Vendored
+34
@@ -4,7 +4,41 @@ import { MergeOptions } from './merge-options';
|
||||
import { CherrypickOptions } from './cherry-pick-options';
|
||||
|
||||
export class Cherrypick {
|
||||
/**
|
||||
* Cherrypick a commit and, changing the index and working directory
|
||||
*
|
||||
* @static
|
||||
* @param {Repository} repo
|
||||
* @param {Commit} commit
|
||||
* @param {CherrypickOptions} [options]
|
||||
* @returns {Promise<number>}
|
||||
*
|
||||
* @memberof Cherrypick
|
||||
*/
|
||||
static cherrypick(repo: Repository, commit: Commit, options?: CherrypickOptions): Promise<number>;
|
||||
/**
|
||||
* Cherrypicks the given commit against "our" commit, producing an index that reflects the result of the cherrypick. The index is not backed by a repo.
|
||||
*
|
||||
* @static
|
||||
* @param {Repository} repo
|
||||
* @param {Commit} cherrypickCommit
|
||||
* @param {Commit} ourCommit
|
||||
* @param {number} mainline
|
||||
* @param {MergeOptions} [mergeOptions]
|
||||
* @returns {Promise<number>}
|
||||
*
|
||||
* @memberof Cherrypick
|
||||
*/
|
||||
static commit(repo: Repository, cherrypickCommit: Commit, ourCommit: Commit, mainline: number, mergeOptions?: MergeOptions): Promise<number>;
|
||||
/**
|
||||
*
|
||||
*
|
||||
* @static
|
||||
* @param {CherrypickOptions} opts
|
||||
* @param {number} version
|
||||
* @returns {number}
|
||||
*
|
||||
* @memberof Cherrypick
|
||||
*/
|
||||
static initOptions(opts: CherrypickOptions, version: number): number;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user