magit/magit

Features

• Git and Version Control - Provides a complete Git interface within Emacs for all version control operations.
• Git Porcelain Wrappers - Ships a complete Git porcelain interface inside Emacs for commits, branches, and diffs.
• Buffer-Integrated Git Operations - Executes Git commands directly from the editor buffer without requiring a separate terminal or staging tool.
• Revision Diff Display - Compares the current buffer against the index or any specified revision with word-level highlighting.
• Branch Management - Provides visual branch management including creation, switching, merging, and deletion.
• Branch Creation - Provides interactive branch creation from any commit, tag, or reference within Emacs.
• Staging Interfaces - Provides an Emacs-based staging area for selectively staging hunks, files, or regions.
• Commit Recording - Records staged modifications as new commits with amend and fixup workflow support.
• Commit Finalization with Messages - Records staged changes as new commits with user-written messages and template support.
• Buffer-Based UI Renderers - Renders the entire Git interface as structured, collapsible sections within Emacs text buffers.
• Git Repository Explorers - Ships an interactive Emacs interface for navigating commit history, file trees, and branch references.
• Index Staging Operations - Stages file changes to the Git index, preparing them for the next commit.
• Git Blame Viewers - Provides enhanced, readable views of git blame information for file annotation.
• Git Branching & Merging - Provides full branch creation, switching, merging, rebasing, and deletion within Emacs.
• Git Diff Viewers - Displays file-level and hunk-level diffs between working tree, index, and arbitrary revisions.
• Remote Change Integration - Fetches changes from a remote repository and merges them into the current branch.
• Git Push Operations - Sends local commits to a configured remote repository via the Git push command.
• Merge Conflict Resolution - Resolves merge conflicts by presenting conflicting sections side by side for editing.
• Git History Navigation - Provides interactive commit log, file revision, and blame navigation within Emacs buffers.
• Remote Repository Operations - Performs cloning, fetching, pulling, and pushing to remote repositories from within Emacs.
• Repository Browsers - Provides an interactive Emacs buffer for navigating commits, diffs, and file states.
• Staging and Commit Interfaces - Provides selective staging of files, hunks, or lines with commit message composition.
• Partial Hunk Staging - Selects specific hunks or lines for staging, leaving other changes unstaged.
• Staged Changes Previews - Displays differences between the index and the last commit to show changes ready to be committed.
• Commit Log Displays - Displays commit logs for branches and files directly within Emacs buffers.
• Commit Cherry Picking Tools - Applies specific commits from one branch to another with full cherry-pick workflow support.
• Visual History Manipulators - Provides interfaces for visually restructuring a repository's commit timeline.
• Rebase Operations - Moves branch commits onto a new base, rewriting history with interactive rebase support.
• Buffer-Based Hunk Staging - Enables granular staging and unstaging by selecting individual diff hunks or lines directly within Emacs buffers.
• Per-File Diff Displays - Displays changes made to a specific file across commits or between the working tree and index.
• Git Pull Operations - Provides full Git pull and push operations for synchronizing with remote repositories.
• Git Command Execution - Executes arbitrary Git commands within Emacs and displays their output, integrating version control into the editor.
• Transient Command Menus - Provides a modal, context-sensitive menu system for executing Git commands with inline argument editing and completion.
• Selective Staging Interfaces - Enables granular staging of individual diff hunks or lines directly within the editor buffer.
• Branch Checkouts - Switches the working tree to an existing branch, updating files and index.
• Editor-Based Compositions - Opens an editor buffer with a pre-filled template and commit message guidelines to compose a structured commit.
• Arbitrary Revision Comparisons - Compares any two commits, branches, or tags to present file-level changes between them.
• Buffer File Staging Operations - Stages or unstages the entire content of the file visited in the current editor buffer.
• Buffer-Based Hunk Staging - Stages or reverts individual diff hunks directly from the editor buffer without a separate staging tool.
• Section-Based Buffer Organizers - Organizes repository information into nested, collapsible sections within buffers for hierarchical navigation.
• Ediff-Based Comparisons - Provides side-by-side and unified diff comparisons using Emacs' Ediff subsystem for revision comparison and conflict resolution.
• Working Tree Diffs - Shows differences between the version control index and the current working directory.
• Version Control Conflict Resolutions - Provides methods for merging concurrent changes in version-controlled codebases without data loss.
• Command Execution Transactions - Manages Git command execution as atomic transactions with automatic buffer refresh and error handling.
• Revisions-Based Creations - Creates new branches from any existing commit, tag, or reference, not just the current HEAD.
• Branch Deletions with Confirmation - Ships branch deletion with explicit user confirmation to prevent accidental data loss.
• Automatic Buffer Refreshes - Automatically updates Magit buffers to reflect repository changes without manual intervention.
• Diff Statistics Summaries - Displays the number of insertions and deletions for each file in the current diff.
• Command-Line Output Parsing - Parses raw Git command output into structured Emacs Lisp data structures for display and manipulation.
• Diff-Based Direct Commits - Creates a new commit using selected changes from a diff, bypassing the staging area.
• Commit Amendments - Modifies the most recent commit by adding new changes or editing its message.
• Branch Renaming Operations - Change the name of an existing branch and update its upstream tracking.
• Tool-Specific Customizations - Adjusts nearly every aspect of Magit's appearance and behavior through Emacs' standard customization interface.
• Customization System Integrations - Exposes all configuration options through Emacs' standard customization system for consistent behavior.
• Line Blame Display - Shows the commit, author, and date for each line of a file, revealing when and why each change was made.
• Diff Region Blame Annotations - Shows the commit that last modified a selected region in a diff using git blame.
• Editor-Based Configurations - Adjusts Git configuration settings directly within the Emacs interface without using the command line.
• Region-Based Diff Filters - Restricts the diff display to a selected hunk or region of changes for focused review.
• Ediff-Based Revision Comparisons - Provides side-by-side file revision comparison using Emacs' Ediff subsystem.
• Remote Repository Cloning - Downloads remote repositories to the local machine by specifying their URL.
• File History Logs with Diffs - Shows the complete commit log for a single file with diffs for each revision.
• Repository Initialization - Creates new Git repositories from scratch within the Emacs interface.
• Commit History Bisecting Tools - Automates binary search across commit history to identify the commit introducing a bug.
• Selective Hunk Applications - Applies selected hunks of changes from the diff to the current working tree.
• Selective Hunk Reversions - Undoes selected hunks of changes in the working tree to restore files to their previous state.
• Hunk Reversions - Reverses selected hunks in the working tree to undo their changes.
• Selective Hunk Applications - Applies selected changes from a diff to the working tree, staging only the chosen hunks.
• Interactive Rebase Editors - Provides an interactive rebase interface for editing any reachable commit and rewriting history.
• Patch Application - Applies patch files to the current repository, integrating changes from external sources.
• Commit Message Editors - Opens an Emacs buffer with a pre-filled template for composing structured commit messages.
• Collapse Sections - Inserts new collapsible regions into the current buffer to organize related content.
• User Confirmation Dialogs - Requires explicit user confirmation before executing destructive version control actions.

Star history