Variable: magit-wip-merge-branch

magit-wip-merge-branch is a customizable variable defined in magit-wip.el.

Value

nil

Documentation

Whether to merge the current branch into its wip ref.

If nil and the current branch has new commits, then the wip ref is reset to the tip of the branch before creating a new wip commit. With this setting wip commits are eventually garbage collected. This is currently the default.

If non-nil and the current branch has new commits, then it is merged into the wip ref before creating a new wip commit. This makes it easier to inspect wip history and the wip commits are never garbage collected.

When this and magit-run-hooks-from-githooks are both enabled, and the other conditions mention in the docstring of that option are also met, then the wip merge commit is created right after the user creates a regular commit. Otherwise the wip merge commit is created right before the next regular commit.

This variable was added, or its default value changed, in magit version 2.90.0.

Source Code

;; Defined in ~/.emacs.d/elpa/magit-20260822.1158/magit-wip.el
(defcustom magit-wip-merge-branch nil
  "Whether to merge the current branch into its wip ref.

If nil and the current branch has new commits, then the wip ref
is reset to the tip of the branch before creating a new wip
commit.  With this setting wip commits are eventually garbage
collected.  This is currently the default.

If non-nil and the current branch has new commits, then it is
merged into the wip ref before creating a new wip commit.  This
makes it easier to inspect wip history and the wip commits are
never garbage collected.

When this and `magit-run-hooks-from-githooks' are both enabled,
and the other conditions mention in the docstring of that option
are also met, then the wip merge commit is created right after
the user creates a regular commit.  Otherwise the wip merge
commit is created right before the next regular commit."
  :package-version '(magit . "2.90.0")
  :group 'magit-wip
  :type 'boolean)