commit

Create a commit on a feature branch without leaving the integration branch.

Usage

git loom commit [-b <branch>] [-m <message>] [-p] [files...]

Options

Option	Description
`-b, --branch <branch>`	Target feature branch (name or short ID). Prompts if omitted.
`-m, --message <message>`	Commit message. Opens editor if omitted.
`-p, --patch`	Interactively select hunks to stage before committing.

File Arguments

Argument	Description
(none)	Uses already-staged files (index as-is)
`zz`	Stages all unstaged changes (like `git add -A`)
short IDs / filenames	Stages only those specific files

When zz appears alongside other file arguments, zz wins and stages everything.

What It Does

Stage — applies the staging rules based on file arguments
Branch resolution — determines the target feature branch
Message resolution — gets the commit message (flag or editor)
Commit — creates the commit
Relocate — moves the commit to the target feature branch, updating all branch refs and integration topology automatically

With -p, an interactive TUI opens before staging, letting you pick individual hunks to include in the commit. Any file arguments narrow the picker to those files; omitting them (or using zz) shows all changes.

If specific files are given alongside -p, any other staged files are saved aside first so they don’t accidentally end up in the commit. They are restored automatically afterward.

Loose Commit

When -b is omitted and the integration branch name matches the upstream’s local counterpart (e.g. main tracking origin/main), the commit is created directly on the integration branch as a loose commit. No branch targeting or rebase is needed. This works regardless of whether local commits or woven branches already exist.

Branches with names that differ from their upstream (e.g. integration tracking origin/main) always require an explicit -b flag.

Branch Resolution

When the integration branch has diverged (woven branches exist):

If -b matches a woven feature branch: uses it
If -b matches an unwoven branch: error
If -b doesn’t match any branch: creates a new branch at the merge-base and weaves it
If -b is omitted: interactive picker with all woven branches + option to create a new one

New Branch Creation

When the target branch doesn’t exist, git-loom validates the name, creates the branch at the merge-base, and weaves it into the integration topology — all automatically.

Examples

Interactive

git loom commit
# ? Select target branch
# > feature-auth
#   feature-ui
# (opens editor for commit message)

Fully specified

git loom commit -b feature-auth -m "add password validation" zz
# Stages all changes, commits to feature-auth

Specific files by short ID

git loom commit -b feature-auth ar -m "fix auth check"
# Stages only src/auth.rs (short ID: ar), commits to feature-auth

To a new branch

git loom commit -b feature-logging -m "add request logging" zz
# Creates feature-logging, weaves it, stages all, commits

Loose commit on a fresh integration branch

git loom commit -m "initial scaffold" zz
# No -b flag, branch matches remote → creates loose commit directly

Interactive hunk selection

git loom commit -b feature-auth -p -m "fix auth check"
# Opens hunk picker for all changes
# Only selected hunks are staged and committed to feature-auth

Hunk selection for specific files

git loom commit -b feature-auth -p ar -m "partial auth fix"
# Opens hunk picker filtered to src/auth.rs
# Other staged files are saved aside and restored after the commit

Conflicts

If the rebase that moves the commit to its target branch hits a conflict, the operation is paused rather than aborted. The committed content is safe in git history; loom saves recovery state to .git/loom/state.json and exits with code 0.

git loom commit -b feature-auth -m "add auth" zz
# ✓ Created branch `feature-auth` at `a1b2c3d`
# ! Conflicts detected — resolve them with git, then run:
#   loom continue   to complete the commit
#   loom abort      to cancel and restore original state

Resolve conflicts, then:

git add <resolved-files>
git loom continue
# ✓ Created commit `b4c5d6e` on branch `feature-auth`

Or cancel and return to the original state (the commit content comes back as unstaged working-tree changes):

git loom abort
# ✓ Aborted `loom commit` and restored original state

See continue and abort for details.

Prerequisites

Must be on an integration branch (has upstream tracking and woven feature branches)
Must have something to commit (staged or stageable changes)

Keyboard shortcuts

git-loom