git-loom

Supercharge your Git workflow by weaving together multiple feature branches

git-loom is a Git CLI tool that makes working with integration branches seamless. Inspired by tools like jujutsu and Git Butler, git-loom helps you work on multiple features simultaneously while keeping your branches organized and independent.

[!IMPORTANT] git-loom has been written with the help of AI, especially Claude

What is git-loom?

git-loom introduces the concept of integration branches - a special branch that weaves together multiple feature branches, allowing you to:

• Work on several features at once in a single branch
• Test how features interact with each other
• Keep feature branches independent and manageable
• Easily amend, reorder, or move commits between branches
• See a clear relationship between your integration and feature branches

Think of it as a loom that weaves multiple threads (feature branches) into a single fabric (integration branch).

Installation

Cargo (all platforms)

cargo install git-loom

Scoop (Windows)

scoop bucket add narnaud https://github.com/narnaud/scoop-bucket
scoop install git-loom

Pre-built binaries

Download the latest archive for your platform from the Releases page:

Extract the binary and place it somewhere on your PATH.

From Source

Requires Rust 1.90 or later.

git clone https://github.com/narnaud/git-loom.git
cd git-loom
cargo install --path .

Usage

Usage: git-loom.exe [OPTIONS] [COMMAND]

Commands:
  init    Initialize a new integration branch tracking a remote
  status  Show the branch-aware status
  commit  Create a commit on a feature branch without leaving integration
  fold    Fold source(s) into a target (amend files, fixup commits, move commits)
  reword  Reword a commit message or rename a branch
  drop    Drop a commit or a branch from history
  show    Show the diff and metadata for a commit (like git show)
  split   Split a commit into two sequential commits
  absorb  Absorb working tree changes into the commits that introduced them
  branch  Create a new feature branch, or a stacked branch
  push    Push a feature branch to remote
  update  Pull-rebase the integration branch and update submodules
  trace   Show the latest command trace
  help    Print this message or the help of the given subcommand(s)

Options:
      --no-color        Disable colored output
      --theme <THEME>   Color theme: auto, dark, light [default: auto]
  -h, --help            Print help
  -V, --version         Print version

Set Up Your Shell

PowerShell

Add the following to your PowerShell profile ($PROFILE):

Invoke-Expression (&git-loom completions powershell | Out-String)

Clink

Create a file at %LocalAppData%\clink\git-loom.lua with:

load(io.popen('git-loom completions clink'):read("*a"))()

Core Concepts

Integration Branch

A branch that merges multiple feature branches together. This allows you to:

• Work on multiple features in a single context
• Test how features work together
• See the combined state of your work

Feature Branches

Independent branches that are combined into the integration branch. You can manage them (reorder, amend, split) without leaving the integration context.

Configuration

Git Config Settings

loom.remote-type

By default, git loom push auto-detects the remote type:

• GitHub if the remote URL contains github.com
• Azure DevOps if the remote URL contains dev.azure.com
• Gerrit if .git/hooks/commit-msg contains "gerrit"
• Plain Git otherwise

You can override this with:

git config loom.remote-type github   # Force GitHub push (push + open PR)
git config loom.remote-type azure    # Force Azure DevOps push (push + open PR)
git config loom.remote-type gerrit   # Force Gerrit push (refs/for/<branch>)

Environment Variables

CLI Flags

Contributing

Contributions are welcome! This project is in early development, so there's plenty of room for new ideas and improvements.

Pre-commit Setup

This project uses pre-commit to manage Git hooks. Install the hooks with:

pre-commit install --install-hooks

This ensures commit messages and code quality checks run automatically before each commit.

License

MIT License - Copyright (c) Nicolas Arnaud-Cormos

See LICENSE file for details.

Acknowledgments

Inspired by:

• jujutsu - A Git-compatible VCS with powerful features for managing complex workflows
• Git Butler - A Git client that makes working with virtual branches easy