Git Clients

git-machete – simplify Git branch workflows

git-machete is a command-line tool for organising related Git branches into a hierarchy. Instead of treating every branch as an unrelated name in a flat list, it records how branches depend on each other and presents a bird’s-eye view of the repository.

This model is particularly useful for developers maintaining several dependent feature branches or a stack of small pull requests. The branch layout makes it easier to see what should be rebased, merged, pushed or pulled and provides commands for working through those operations systematically.

This is free and open source software.

Key Features

  • Displays branches as an easy-to-read hierarchy showing their relationships.
  • git machete status summarises the state of branches and their upstream relationships.
  • git machete discover can derive a branch layout from an existing repository.
  • git machete traverse walks through branches and assists with rebasing, merging, pushing and pulling.
  • Designed for maintaining small, focused and dependent pull requests.
  • Supports GitHub and GitLab integration for retrieving and creating pull or merge requests.
  • Can limit retrieved pull or merge requests according to their author.
  • Branch annotations can customise behaviour without changing the underlying Git branch.
  • Branches can be marked to prevent particular push or pull-request operations during traversal.
  • Works with repositories containing teammates’ branches as well as the developer’s own work.
  • Understands repository configuration and normal Git configuration values.
  • Supports workflows involving forks and provides guidance around pull-request creation from them.
  • Respects Git commit-signing configuration when operations create rewritten commits.
  • Can be introduced to an existing repository without changing Git’s underlying branch structure.

Website: github.com/VirtusLab/git-machete
Support:
Developer: VirtusLab
License: MIT License

git-machete is written in Python. Learn Python with our recommended free books and free tutorials.


Related Software

Git Workflow Tools
git-extrasSuperb collection of tools for Git
forgitUtility for using git interactively
wrkflwValidate and run GitHub Actions workflows locally
git-branchlessBranchless workflow for git
git-absorbSuper-charging git rebase
git-toolbeltSuite of useful Git commands
git-openAdds a handy git open command to Git.
git-townAutomate the creation, synchronization, shipping, and cleanup
git-fuzzyInteractive git with the help of fzf
git-recentJump between recently used local Git branches
git-macheteRobust tool that simplifies your git workflows
git-flow-nextModern implementation of the Git-flow branching model
Git Interactive Rebase ToolTerminal-based sequence editor for interactive rebase
git-crecordInteractively select changes to commit or stage
git-xargsUpdate across multiple GitHub repositories
git-prompt.zshLightweight git prompt for zsh
gh-stackGitHub CLI extension for managing stacked pull requests
drydockMonitor unfinished work across multiple Git repositories
git reviseGit subcommand and Python library
wtpEnhanced Git worktree management
LazyWorktreeGit worktree management for the terminal
gwmCreate and manage isolated Git worktrees from the terminal
git-spiceCreate, rebase and submit stacks of dependent Git branches
git-smartSmall collection of Git helper commands
staxCLI and TUI for stacked Git branches and PRs
git-fixupCommand-line helper for Git users
git-autofixupGit helper that creates fixup commits for topic branches
BranchletCreate and manage Git worktrees

Read our verdict in the software roundup.


Best Free and Open Source Software 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.
Subscribe

Please read our Comment Policy before commenting.

Notify of
guest
0 Comments
Oldest
Newest Most Voted