MergeOpts

MergeOpts = object

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

Options for git merge

Properties

abort?

optional abort: boolean

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

Abort merge

---

allowUnrelatedHistories?

optional allowUnrelatedHistories: boolean

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

Allow merging histories that do not share a common ancestor

---

autostash?

optional autostash: boolean

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

Automatically stash before merge and unstash after

---

cleanup?

optional cleanup: "strip" | "whitespace" | "verbatim" | "scissors" | "default"

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

How to clean up the commit message

---

compactSummary?

optional compactSummary: boolean

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

Show compact summary of changed files

---

continue?

optional continue: boolean

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

Continue merge

---

ff?

optional ff: "only" | "no" | boolean

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

Fast-forward behavior

---

gpgSign?

optional gpgSign: boolean | string

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

GPG-sign the merge commit (optionally with key id)

---

intoName?

optional intoName: string

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

Use custom branch name in merge commit message

---

log?

optional log: boolean | number

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

Add log of commits being merged (optionally with count)

---

message?

optional message: string

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

Merge message

---

noCommit?

optional noCommit: boolean

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

No commit after merge

---

noDiffstat?

optional noDiffstat: boolean

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

Do not show diffstat at end of merge

---

noVerify?

optional noVerify: boolean

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

Bypass pre-merge-commit hook

---

overwriteIgnore?

optional overwriteIgnore: boolean

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

Silently overwrite ignored files

---

quiet?

optional quiet: boolean

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

Be quiet

---

quit?

optional quit: boolean

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

Quit the current in-progress merge without cleanup

---

rerereAutoupdate?

optional rerereAutoupdate: boolean

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

Automatically update rerere state

---

signoff?

optional signoff: boolean

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

Add Signed-off-by trailer

---

squash?

optional squash: boolean

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

Squash merge

---

stat?

optional stat: boolean

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

Show diffstat at end of merge

---

strategy?

optional strategy: string

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

Strategy to use

---

strategyOption?

optional strategyOption: string | string[]

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

Strategy options

---

verbose?

optional verbose: boolean

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

Be verbose

---

verifySignatures?

optional verifySignatures: boolean

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

Verify that commit is signed with a valid key