File: magit-merge.el.html
This library implements merge commands.
Defined variables (0)
Defined functions (21)
magit--merge-absorb | (BRANCH ARGS &optional MESSAGE) |
magit--merge-absorb-1 | (BRANCH ARGS) |
magit--merge-range | (&optional HEAD) |
magit-checkout-read-stage | (FILE) |
magit-checkout-stage | (FILE ARG) |
magit-insert-merge-log | () |
magit-merge | () |
magit-merge-abort | () |
magit-merge-absorb | (BRANCH &optional ARGS) |
magit-merge-dissolve | (BRANCH &optional ARGS) |
magit-merge-editmsg | (REV &optional ARGS) |
magit-merge-nocommit | (REV &optional ARGS) |
magit-merge-plain | (REV &optional ARGS NOCOMMIT) |
magit-merge-preview | (REV) |
magit-merge-squash | (REV) |
magit-merge:--strategy | () |
magit-merge:--strategy-option | () |
transient:magit-merge:--ff-only | () |
transient:magit-merge:--no-ff | () |
transient:magit-merge:-Xignore-all-space | () |
transient:magit-merge:-Xignore-space-change | () |