git-smart is a collection of Git helper commands intended to make everyday repository operations safer and easier to understand. It provides alternatives to several familiar Git commands, applying additional logic and explaining the operations being performed.
Developers who are still learning Git can find commands such as pull, merge and rebase confusing, particularly when local and remote histories have diverged. Choosing an inappropriate operation may introduce unwanted merge commits or make a repository’s history more complicated than necessary.
git-smart attempts to choose sensible behaviour for common situations while keeping the underlying Git commands visible. Rather than hiding what Git is doing, its commands are intended to explain their decisions so developers can become more comfortable with standard Git operations.
The collection concentrates on three activities: updating a local branch, merging changes and inspecting repository history. It is a small convenience layer rather than a replacement for Git itself.
This is free and open source software.
Key Features
- Provides additional Git commands with guided behaviour for common operations.
- smart-pull selects an appropriate strategy for updating the current branch.
- Uses configured tracking branches or a matching branch on origin when appropriate.
- Supports rebasing when required to reconcile local and remote changes.
- Can stash and restore local modifications during supported update operations.
- smart-merge wraps Git’s non-fast-forward merge behaviour.
- Provides additional feedback during merge operations.
- smart-log displays commit history using an enhanced log format.
- Displays repository-modifying Git commands so users can understand the operations performed.
- Can be used through Git’s normal custom-subcommand mechanism.
Website: github.com/geelen/git-smart
Support:
Developer: Glen Maddern
License: MIT License
git-smart is written in Ruby. Learn Ruby 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.