git-autofixup is a Git helper that automatically generates fixup commits for changes made on a topic branch. It helps developers incorporate corrections into earlier commits while preserving a logical and readable history.
During feature development, it is common to revisit code introduced in earlier commits. A developer may correct a mistake, adjust an implementation or respond to review feedback after several additional changes have already been committed.
Without assistance, organising these corrections involves identifying the appropriate original commits and preparing individual fixup commits. git-autofixup reduces that manual work by examining changes in the working directory and using Git’s blame information to determine their likely origins.
The utility analyses changes as individual diff hunks, allowing modifications affecting different earlier commits to be handled separately. It also provides controls over how confidently a change must be associated with a previous commit.
Generated fixup commits can subsequently be incorporated into the original commits through Git’s interactive rebase and autosquash functionality.
This is free and open source software.
Key Features
- Automatically generates fixup commits for modifications on topic branches.
- Uses git diff to analyse individual hunks of changed code.
- Uses git blame to associate modified lines with earlier commits.
- Can create multiple fixup commits when changes belong to different commits.
- Restricts candidate commits to a specified revision range.
- Automatically determines a suitable base revision from upstream tracking information when available.
- Processes only staged changes when modifications have been added to the Git index.
- Supports path filtering to restrict processing to selected files.
- Provides configurable strictness levels for assigning changes to earlier commits.
- Avoids assigning changes when the relationship to an earlier commit is insufficiently clear.
- Uses a temporary index when creating the generated commits.
- Integrates with Git’s interactive rebase and autosquash workflow.
- Provides verbosity options for examining how changes are processed.
Website: github.com/torbiak/git-autofixup
Support:
Developer: Jordan Torbiak
License: Artistic License 2.0
git-autofixup is written in Perl. Learn Perl with our recommended free books and free tutorials.
Related Software
| Git Workflow Tools | |
|---|---|
| git-extras | Superb collection of tools for Git |
| forgit | Utility for using git interactively |
| wrkflw | Validate and run GitHub Actions workflows locally |
| git-branchless | Branchless workflow for git |
| git-absorb | Super-charging git rebase |
| git-toolbelt | Suite of useful Git commands |
| git-open | Adds a handy git open command to Git. |
| git-town | Automate the creation, synchronization, shipping, and cleanup |
| git-fuzzy | Interactive git with the help of fzf |
| git-recent | Jump between recently used local Git branches |
| git-machete | Robust tool that simplifies your git workflows |
| git-flow-next | Modern implementation of the Git-flow branching model |
| Git Interactive Rebase Tool | Terminal-based sequence editor for interactive rebase |
| git-crecord | Interactively select changes to commit or stage |
| git-xargs | Update across multiple GitHub repositories |
| git-prompt.zsh | Lightweight git prompt for zsh |
| gh-stack | GitHub CLI extension for managing stacked pull requests |
| drydock | Monitor unfinished work across multiple Git repositories |
| git revise | Git subcommand and Python library |
| wtp | Enhanced Git worktree management |
| LazyWorktree | Git worktree management for the terminal |
| gwm | Create and manage isolated Git worktrees from the terminal |
| git-spice | Create, rebase and submit stacks of dependent Git branches |
| git-smart | Small collection of Git helper commands |
| stax | CLI and TUI for stacked Git branches and PRs |
| git-fixup | Command-line helper for Git users |
| git-autofixup | Git helper that creates fixup commits for topic branches |
| Branchlet | Create and manage Git worktrees |
Read our verdict in the software roundup.
 LinuxLinks helps you discover the best free and open source software for Linux. Explore our extensive collection of recommended applications, including alternatives to popular proprietary software.We also publish software reviews, Linux tutorials, hardware reviews, free programming books and articles covering the wider open source community. Browse our Linux resources to discover more. Know a useful free and open source Linux application we haven't covered? Suggest a program for inclusion. Has your software been featured on LinuxLinks? Display one of our Featured on LinuxLinks badges on your website or GitHub README. |
Please read our Comment Policy before commenting.