File: magit-merge.el.html
This library implements merge commands.
Defined variables (0)
Defined functions (21)
magit--merge-absorb | |
magit--merge-absorb-1 | |
magit--merge-range | |
magit-checkout-read-stage | |
magit-checkout-stage | |
magit-insert-merge-log | |
magit-merge | [Arg list not available until function definition is loaded.] |
magit-merge-abort | [Arg list not available until function definition is loaded.] |
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 |