This section describes how to enter Ediff from Magit buffers. For information on how to use Ediff itself, see (ediff)Top.
Compare, stage, or resolve using Ediff.
This command tries to guess what file, and what commit or range the
user wants to compare, stage, or resolve using Ediff. It might only
be able to guess either the file, or range/commit, in which case
the user is asked about the other. It might not always guess right,
in which case the appropriate
magit-ediff-* command has to be used
explicitly. If it cannot read the user’s mind at all, then it asks
the user for a command to run.
This prefix command shows the following suffix commands in a popup buffer.
Compare two revisions of a file using Ediff.
If the region is active, use the revisions on the first and last line of the region. With a prefix argument, instead of diffing the revisions, choose a revision to view changes along, starting at the common ancestor of both revisions (i.e., use a "…" range).
Resolve outstanding conflicts in a file using Ediff, defaulting to the file at point.
Provided that the value of
diff3, you can
view the file’s merge-base revision using
/ in the Ediff control
In the rare event that you want to manually resolve all conflicts,
including those already resolved by Git, use
Stage and unstage changes to a file using Ediff, defaulting to the file at point.
Show unstaged changes to a file using Ediff.
Show staged changes to a file using Ediff.
Show changes in a file between
HEAD and working tree using Ediff.
Show changes to a file introduced by a commit using Ediff.
Show changes to a file introduced by a stash using Ediff.
This option controls what command
magit-ediff-dwim calls when
point is on uncommitted hunks. When nil, always run
magit-ediff-stage. Otherwise, use
magit-ediff-show-unstaged to show staged and unstaged changes,
This option controls whether
magit-ediff-show-stash includes a
buffer containing the file’s state in the index at the time the
stash was created. This makes it possible to tell which changes in
the stash were staged.
This hook is run after quitting an Ediff session that was created using a Magit command. The hook functions are run inside the Ediff control buffer, and should not change the current buffer.
This is similar to
ediff-quit-hook but takes the needs of Magit into
account. The regular
ediff-quit-hook is ignored by Ediff sessions
that were created using a Magit command.