File: magit-diff.el.html

This library implements support for looking at Git diffs and commits.

Defined variables (51)

magit-commit-message-section-mapKeymap for ‘commit-message’ sections.
magit-diff-adjust-tab-widthWhether to adjust the width of tabs in diffs.
magit-diff-buffer-file-lockedWhether ‘magit-diff-buffer-file’ uses a dedicated buffer.
magit-diff-expansion-thresholdAfter how many seconds not to expand anymore diffs.
magit-diff-extra-stat-argumentsAdditional arguments to be used alongside ‘--stat’.
magit-diff-fontify-hunkWhether to apply syntax highlighting to diff hunks.
magit-diff-hide-trailing-cr-charactersWhether to hide ^M characters at the end of a line in diffs.
magit-diff-highlight-hunk-bodyWhether to highlight bodies of selected hunk sections.
magit-diff-highlight-hunk-region-functionsThe functions used to highlight the hunk-internal region.
magit-diff-highlight-indentationHighlight the "wrong" indentation style.
magit-diff-highlight-trailingWhether to highlight whitespace at the end of a line in diffs.
magit-diff-mode-abbrev-tableAbbrev table for ‘magit-diff-mode’.
magit-diff-mode-hookHook run after entering Magit-Diff mode.
magit-diff-mode-mapKeymap for ‘magit-diff-mode’.
magit-diff-mode-syntax-tableSyntax table for ‘magit-diff-mode’.
magit-diff-paint-whitespaceSpecify where to highlight whitespace errors.
magit-diff-paint-whitespace-linesSpecify in what kind of lines to highlight whitespace errors.
magit-diff-refine-hunkWhether to refine hunks to show word-granularity differences.
magit-diff-refine-ignore-whitespaceWhether to ignore whitespace changes in word-granularity differences.
magit-diff-section-base-mapKeymap for diff sections.
magit-diff-section-mapKeymap for diff sections.
magit-diff-sections-hookHook run to insert sections into a ‘magit-diff-mode’ buffer.
magit-diff-specify-hunk-foregroundWhether to specify foreground colors for hunk faces.
magit-diff-unmarked-lines-keep-foregroundWhether ‘magit-diff-highlight-hunk-region-dim-outside’ preserves foreground.
magit-diff-use-indicator-facesWhether to use separate faces for diff side indicators.
magit-diff-visit-prefer-worktreeWhether ‘magit-diff-visit-file’ prefers visiting the worktree file.
magit-diff-visit-previous-blobWhether ‘magit-diff-visit-file’ may visit the previous blob.
magit-file-section-mapKeymap for ‘file’ sections.
magit-format-file-functionFunction used to format lines representing a file.
magit-hunk-section-mapKeymap for ‘hunk’ sections.
magit-hunk-section-smerge-mapKeymap bound to ‘smerge-command-prefix’ in ‘magit-hunk-section-map’.
magit-merge-preview-mode-abbrev-tableAbbrev table for ‘magit-merge-preview-mode’.
magit-merge-preview-mode-hookHook run after entering Magit Merge mode.
magit-merge-preview-mode-mapKeymap for ‘magit-merge-preview-mode’.
magit-merge-preview-mode-syntax-tableSyntax table for ‘magit-merge-preview-mode’.
magit-revision-fill-summary-lineWhether to fill excessively long summary lines.
magit-revision-filter-files-on-followWhether to honor file filter if log arguments include --follow.
magit-revision-headers-formatFormat string used to insert headers in revision buffers.
magit-revision-insert-related-refsWhether to show related branches in revision buffers.
magit-revision-insert-related-refs-display-alistHow ‘magit-insert-revision-headers’ displays related branch types.
magit-revision-mode-abbrev-tableAbbrev table for ‘magit-revision-mode’.
magit-revision-mode-hookHook run after entering Magit-Revision mode.
magit-revision-mode-mapKeymap for ‘magit-revision-mode’.
magit-revision-mode-syntax-tableSyntax table for ‘magit-revision-mode’.
magit-revision-sections-hookHook run to insert sections into a ‘magit-revision-mode’ buffer.
magit-revision-show-gravatarsWhether to show gravatar images in revision buffers.
magit-revision-use-hash-sectionsWhether to turn hashes inside the commit message into sections.
magit-revision-wash-message-hookFunctions used to highlight parts of a commit message.
magit-staged-section-mapKeymap for the ‘staged’ section.
magit-unstaged-section-mapKeymap for the ‘unstaged’ section.
magit-wash-message-hookFunctions used to highlight parts of a commit message.

Defined functions (153)

magit--diff-pair(BUFFER A B &optional FILE)
magit--get-file-icon(KIND FILE FACE STATUS ORIG ICON-FOR-FILE ICON-FOR-DIR DIR-IS-SUBMODULE)
magit--insert-diff(KEEP-ERROR &rest ARGS)
magit--insert-related-refs(REV ARG TITLE REMOTE)
magit-diff()
magit-diff--combined-p(SECTION)
magit-diff--dwim()
magit-diff--get-hunk-syntax(HUNK SIDE REV FILE)
magit-diff--get-hunk-text(HUNK FROM)
magit-diff--get-value(MODE &optional USE-BUFFER-ARGS)
magit-diff--goto-file-position(FILE LINE COLUMN &optional PARENT)
magit-diff--hunk-after-string(FACE)
magit-diff--locate-file-position(FILE LINE COLUMN &optional PARENT)
magit-diff--make-hunk-overlay(START END &rest ARGS)
magit-diff--maybe-add-stat-arguments(ARGS)
magit-diff--modified-defuns-1(REV FILE LINES)
magit-diff--modified-lines(BOUND)
magit-diff--range-to-endpoints(RANGE)
magit-diff--region-range(&optional INTERACTIVE MBASE)
magit-diff--set-value(OBJ &optional SAVE)
magit-diff--update-hunk-syntax(&optional HUNK)
magit-diff-arguments(&optional MODE)
magit-diff-buffer-file()
magit-diff-default-context()
magit-diff-dwim(&optional ARGS FILES)
magit-diff-expansion-threshold(SECTION)
magit-diff-file-header(SECTION &optional NO-RENAME)
magit-diff-flip-revs()
magit-diff-highlight-hunk-region-dim-outside(SECTION)
magit-diff-highlight-hunk-region-using-face(SECTION)
magit-diff-highlight-hunk-region-using-overlays(SECTION)
magit-diff-highlight-hunk-region-using-underline(SECTION)
magit-diff-hunk-column(SECTION GOTO-FROM)
magit-diff-hunk-line(SECTION GOTO-FROM)
magit-diff-hunk-region-header(SECTION)
magit-diff-hunk-region-patch(SECTION &optional ARGS)
magit-diff-insert-file-section(FILE ORIG STATUS MODES RENAME HEADER BINARY LONG-STATUS)
magit-diff-inside-hunk-body-p()
magit-diff-less-context(&optional COUNT)
magit-diff-mode()
magit-diff-more-context(&optional COUNT)
magit-diff-on-removed-line-p()
magit-diff-paint-tab(MERGING WIDTH)
magit-diff-paint-whitespace(MERGING LINE-TYPE DIFF-TYPE)
magit-diff-paths(A B)
magit-diff-prefix(&rest SLOTS)
magit-diff-prefix--anon-cmacro(WHOLE &rest SLOTS)
magit-diff-prefix--eieio-childp(OBJ)
magit-diff-prefix-child-p(OBJ)
magit-diff-prefix-list-p(ARG1)
magit-diff-prefix-p(OBJ)
magit-diff-range(REV-OR-RANGE &optional ARGS FILES)
magit-diff-read-range-or-commit(PROMPT &optional SECONDARY-DEFAULT MBASE)
magit-diff-refresh()
magit-diff-refresh-buffer()
magit-diff-refresh-prefix(&rest SLOTS)
magit-diff-refresh-prefix--anon-cmacro(WHOLE &rest SLOTS)
magit-diff-refresh-prefix--eieio-childp(OBJ)
magit-diff-refresh-prefix-child-p(OBJ)
magit-diff-refresh-prefix-list-p(ARG1)
magit-diff-refresh-prefix-p(OBJ)
magit-diff-scope(&optional (SECTION nil SSECTION) STRICT)
magit-diff-select-algorithm(&rest IGNORE)
magit-diff-select-color-moved-mode(&rest IGNORE)
magit-diff-select-color-moved-ws-mode(&rest IGNORE)
magit-diff-select-ignore-submodules(&rest IGNORED)
magit-diff-select-merges(&rest IGNORE)
magit-diff-set-context(FN)
magit-diff-setup-buffer(RANGE TYPEARG ARGS FILES &optional TYPE LOCKED)
magit-diff-show-or-scroll(FN)
magit-diff-show-or-scroll-down()
magit-diff-show-or-scroll-up()
magit-diff-staged(&optional REV ARGS FILES)
magit-diff-switch-range-type()
magit-diff-tab-width(FILE)
magit-diff-toggle-file-filter()
magit-diff-toggle-fontify-hunk(&optional STYLE)
magit-diff-toggle-refine-hunk(&optional STYLE)
magit-diff-type(&optional SECTION)
magit-diff-unmerged(&optional ARGS FILES)
magit-diff-unstaged(&optional ARGS FILES)
magit-diff-update-hunk-refinement(&optional SECTION ALLOW-REMOVE)
magit-diff-update-hunk-region(SECTION)
magit-diff-use-window-width-as-stat-width()
magit-diff-visit--offset(LINE FILE &rest ARGS)
magit-diff-visit--position(BUFFER REV FILE GOTO-FROM GOTO-FILE)
magit-diff-visit-directory(DIRECTORY &optional OTHER-WINDOW)
magit-diff-visit-file(&optional OTHER-WINDOW)
magit-diff-visit-file--internal(FORCE-WORKTREE DISPLAY)
magit-diff-visit-file--noselect(&optional GOTO-FILE)
magit-diff-visit-file--setup(BUF POS)
magit-diff-visit-file-other-frame()
magit-diff-visit-file-other-window()
magit-diff-visit-worktree-file(&optional OTHER-WINDOW)
magit-diff-visit-worktree-file-other-frame()
magit-diff-visit-worktree-file-other-window()
magit-diff-wash-diff(ARGS)
magit-diff-wash-diffs(ARGS &optional LIMIT)
magit-diff-wash-signature(OBJECT)
magit-diff-while-committing()
magit-diff-working-tree(&optional REV ARGS FILES)
magit-diff:--color-moved()
magit-diff:--color-moved-ws()
magit-diff:--diff-algorithm()
magit-diff:--diff-merges()
magit-diff:--ignore-submodules()
magit-diff:--no-ext-diff()
magit-diff:--show-signature()
magit-diff:--stat()
magit-diff:-C()
magit-diff:-M()
magit-diff:-R()
magit-diff:-U()
magit-format-file(KIND FILE FACE &optional STATUS ORIG)
magit-format-file-all-the-icons(KIND FILE FACE &optional STATUS ORIG)
magit-format-file-default(KIND FILE FACE &optional STATUS ORIG)
magit-format-file-nerd-icons(KIND FILE FACE &optional STATUS ORIG)
magit-highlight-bracket-keywords()
magit-highlight-squash-markers()
magit-hunk-set-window-start(SECTION)
magit-insert-diff()
magit-insert-revision-diff()
magit-insert-revision-gravatar(BEG REV EMAIL REGEXP)
magit-insert-revision-gravatar-cb(IMAGE SIZE REV MARKER ALIGN-TO COLUMN)
magit-insert-revision-gravatars(REV BEG)
magit-insert-revision-headers()
magit-insert-revision-message()
magit-insert-revision-notes()
magit-insert-revision-tag()
magit-insert-staged-changes()
magit-insert-unstaged-changes()
magit-jump-to-diffstat-or-diff(&optional EXPAND)
magit-jump-to-revision-diff(&optional EXPAND)
magit-jump-to-revision-diffstat(&optional EXPAND)
magit-jump-to-revision-headers(&optional ARG1)
magit-jump-to-revision-message(&optional ARG1)
magit-jump-to-revision-notes(&optional ARG1)
magit-jump-to-staged(&optional ARG1)
magit-jump-to-unstaged(&optional ARG1)
magit-merge-preview-mode()
magit-merge-preview-setup-buffer(REV)
magit-read-files(PROMPT INITIAL-INPUT HISTORY &optional LIST-FN)
magit-revision-insert-related-refs-display-p(SYM)
magit-revision-jump(&optional ARG1)
magit-revision-mode()
magit-revision-setup-buffer(REV ARGS FILES)
magit-section-cycle-diffs()
magit-show-commit(REV &optional ARGS FILES MODULE)
magit:--()
transient:magit-diff-infix-arguments:--function-context()
transient:magit-diff-infix-arguments:--ignore-all-space()
transient:magit-diff-infix-arguments:--ignore-space-change()
transient:magit-diff-infix-arguments:--irreversible-delete()

Defined faces (35)

magit-diff-addedFace for lines in a diff that have been added.
magit-diff-added-highlightFace for lines in a diff that have been added.
magit-diff-added-indicatorFace for indicators on lines in a diff that have been added. Only used if `magit-diff-use-indicator-faces' is non-nil.
magit-diff-baseFace for lines in a diff for the base side in a conflict.
magit-diff-base-headingFace for headings of common base in merge conflicts.
magit-diff-base-highlightFace for lines in a diff for the base side in a conflict.
magit-diff-base-indicatorFace for indicators on lines in a diff for base side in a conflict. Only used if `magit-diff-use-indicator-faces' is non-nil.
magit-diff-conflict-headingFace for conflict markers.
magit-diff-conflict-heading-highlightFace for conflict markers.
magit-diff-contextFace for lines in a diff that are unchanged.
magit-diff-context-highlightFace for lines in the current context in a diff.
magit-diff-file-headingFace for diff file headings.
magit-diff-file-heading-selectionFace for selected diff file headings.
magit-diff-hunk-headingFace for diff hunk headings.
magit-diff-hunk-heading-highlightFace for current diff hunk headings.
magit-diff-hunk-heading-selectionFace for selected diff hunk headings.
magit-diff-hunk-regionFace used by `magit-diff-highlight-hunk-region-using-face'. This face is overlaid over text that uses other hunk faces, and those normally set the foreground and background colors. The `:foreground' and especially the `:background' properties should be avoided here. Setting the latter would cause the loss of information. Good properties to set here are `:weight' and `:slant'.
magit-diff-lines-boundaryFace for boundary of marked lines in diff hunk.
magit-diff-lines-headingFace for diff hunk heading when lines are marked.
magit-diff-ourFace for lines in a diff for our side in a conflict.
magit-diff-our-headingFace for headings of our side in merge conflicts.
magit-diff-our-highlightFace for lines in a diff for our side in a conflict.
magit-diff-our-indicatorFace for indicators on lines in a diff for our side in a conflict. Only used if `magit-diff-use-indicator-faces' is non-nil.
magit-diff-removedFace for lines in a diff that have been removed.
magit-diff-removed-highlightFace for lines in a diff that have been removed.
magit-diff-removed-indicatorFace for indicators on lines in a diff that have been removed. Only used if `magit-diff-use-indicator-faces' is non-nil.
magit-diff-revision-summaryFace for commit message summaries.
magit-diff-revision-summary-highlightFace for highlighted commit message summaries.
magit-diff-theirFace for lines in a diff for their side in a conflict.
magit-diff-their-headingFace for headings of their side in merge conflicts.
magit-diff-their-highlightFace for lines in a diff for their side in a conflict.
magit-diff-their-indicatorFace for indicators on lines in a diff for their side in a conflict. Only used if `magit-diff-use-indicator-faces' is non-nil.
magit-diff-whitespace-warningFace for highlighting whitespace errors added lines.
magit-diffstat-addedFace for addition indicator in diffstat.
magit-diffstat-removedFace for removal indicator in diffstat.