git-fixup is a command-line helper that simplifies the creation of fixup commits for Git’s interactive rebase workflow. It is designed for developers who regularly refine their commit history and want to avoid manually searching for the appropriate commit to modify.
When correcting an earlier change, the usual approach involves examining the commit history, identifying the target commit and creating a fixup commit that refers to its hash. This can become tedious when a feature branch contains numerous small commits.
git-fixup uses information from the staged changes and Git history to identify likely targets. It examines modified files and lines, finds commits associated with those changes and presents candidates from which the developer can select.
The utility also provides convenient commands for creating squash and amend commits. Its integration with autosquash allows developers to incorporate changes into earlier commits without manually constructing the entire rebase sequence.
This is free and open source software.
Key Features
- Suggests likely fixup targets by examining staged changes and Git history.
- Uses git blame and git log to identify commits associated with modified lines.
- Creates fixup!, squash! and amend! commits.
- Supports selecting a target commit interactively.
- Can use external selection interfaces such as fzf.
- Allows a target commit to be specified directly.
- Can launch an interactive autosquash rebase after creating a correction commit.
- Configurable base revisions restrict the history searched for candidate commits.
- Supports configured upstream branches and automatic base selection.
- Configuration through Git settings and environment variables.
- Provides options for controlling default actions and commit selection behaviour.
- Can bypass commit hooks when explicitly requested.
- Supports shell completion for convenient commit selection.
Website: github.com/keis/git-fixup
Support:
Developer: David Keijser and contributors
License: ISC License
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.