Rebase

Contains helper functions which allow to deal with git rebase.

Functions and values

Function or valueDescription
abort(repositoryDir)
Signature: repositoryDir:string -> unit

Restore the original branch and abort the rebase operation.

continueRebase(repositoryDir)
Signature: repositoryDir:string -> unit

Restart the rebasing process after having resolved a merge conflict.

rebaseOrFallbackOnMerge(...)
Signature: repositoryDir:string -> onTopOfBranch:string -> bool

Tries to rebase on top of the given branch. If the rebasing process fails a normal merge will be started. Returns if the process used merge instead of rebase.

skip(repositoryDir)
Signature: repositoryDir:string -> unit

Restart the rebasing process by skipping the current patch.

start repositoryDir onTopOfBranch
Signature: repositoryDir:string -> onTopOfBranch:string -> unit

Performs a rebase on top of the given branch with the current branch