コンテンツにスキップ

RestoreOpts

このコンテンツはまだ日本語訳がありません。

RestoreOpts = object

Defined in: src/core/repo.ts:1335

Options for git restore

Properties

conflict?

optional conflict: "merge" | "diff3" | "zdiff3"

Defined in: src/core/repo.ts:1361

Conflict style for merge conflicts


ignoreSkipWorktreeBits?

optional ignoreSkipWorktreeBits: boolean

Defined in: src/core/repo.ts:1363

Ignore skip-worktree bits


ignoreUnmerged?

optional ignoreUnmerged: boolean

Defined in: src/core/repo.ts:1349

Ignore unmerged entries


merge?

optional merge: boolean

Defined in: src/core/repo.ts:1359

Attempt to recreate merge conflicts


ours?

optional ours: boolean

Defined in: src/core/repo.ts:1344

Ours or theirs for conflicts


overlay?

optional overlay: boolean

Defined in: src/core/repo.ts:1351

Allow overlay mode (default is no-overlay)


pathspecFromFile?

optional pathspecFromFile: string

Defined in: src/core/repo.ts:1365

Read pathspecs from file


progress?

optional progress: boolean

Defined in: src/core/repo.ts:1357

Show progress


quiet?

optional quiet: boolean

Defined in: src/core/repo.ts:1353

Suppress output


recurseSubmodules?

optional recurseSubmodules: boolean

Defined in: src/core/repo.ts:1355

Recurse into submodules


source?

optional source: string

Defined in: src/core/repo.ts:1342

Source to restore from


staged?

optional staged: boolean

Defined in: src/core/repo.ts:1338

Restore staged files


theirs?

optional theirs: boolean

Defined in: src/core/repo.ts:1345


worktree?

optional worktree: boolean

Defined in: src/core/repo.ts:1340

Restore working tree files