Skip to main content

🔪 git-surgeon

Surgical git history rewriting: a modular CLI toolkit wrapping git-filter-repo.

Rewrite authors, scrub sensitive data, clean commit messages, flatten merges, and filter commits, all in a single pass with automatic backup & undo.

Features

Feature Description
Message Scrub Find-and-replace text in commit messages (literal or regex)
Blob Scrub Remove secrets, emails, keys from file contents across all history
Merge Flatten Linearize history by converting merge commits to single-parent
Commit Filter Remove or keep commits matching specific criteria
Backup & Undo Automatic git bundle backup + git-surgeon undo to restore
Watermark & Detect Rewritten commits carry a Rewritten-With: git-surgeon trailer; git-surgeon detect finds them (--no-watermark to skip)
Dry Run Preview every change before touching the repo
Interactive Wizard Run git-surgeon with no args for guided setup
Config Persistence Operations saved to .git-surgeon/config.toml (auto-gitignored)

Usage Instructions

pip install git-surgeon-cli

or

uv add git-surgeon-cli

Requires Python ≥3.12 and git on PATH.

cd /path/to/your/repo

# Option A: Interactive wizard
git-surgeon

# Option B: CLI commands
git-surgeon init
git-surgeon rewrite-authors --name "Jane" --email "jane@example.com" --default --save
git-surgeon scrub --find "secret-api-key" --replace "***REMOVED***"
git-surgeon run          # creates backup, rewrites history
git-surgeon undo         # restore if needed

Architecture

graph TD
    classDef cli fill:#e1f5fe,stroke:#0288d1,stroke-width:2px,color:#000;
    classDef core fill:#fff3e0,stroke:#f57c00,stroke-width:2px,color:#000;
    classDef ops fill:#e8f5e9,stroke:#388e3c,stroke-width:2px,color:#000;
    classDef ext fill:#eceff1,stroke:#607d8b,stroke-width:2px,color:#000;

    U([User Input]) --> CLI[CLI & Wizard]:::cli
    CLI --> Core[Engine Orchestrator]:::core
    Core <--> Ops[Pluggable Operations]:::ops
    Core --> GFR[git-filter-repo]:::ext
    GFR --> Git[Git Repository]:::ext

For a detailed breakdown of the system architecture and data flow, see the Architecture Documentation.

Documentation

For full guides on usage, configuration, internals, and operations, please visit the Documentation Index or build the docs using MkDocs. For AI agent integration, see docs/mcp-setup.md.

WIP

Safety

Every git-surgeon run automatically creates a git bundle backup at .git-surgeon/backup.bundle before touching history. Run git-surgeon undo to fully restore. Use --dry-run on any command to preview without modifying anything.

About

License

Apache License 2.0. See LICENSE for details.

Pypi

PyPI version Python versions

Download files

Download the file for your platform. If you're not sure which to choose, learn more about installing packages.

Source Distribution

git_surgeon_cli-0.2.0.tar.gz (65.6 kB view details)

Uploaded Source

Built Distribution

If you're not sure about the file name format, learn more about wheel file names.

git_surgeon_cli-0.2.0-py3-none-any.whl (64.7 kB view details)

Uploaded Python 3

File details

Details for the file git_surgeon_cli-0.2.0.tar.gz.

File metadata

  • Download URL: git_surgeon_cli-0.2.0.tar.gz
  • Upload date:
  • Size: 65.6 kB
  • Tags: Source
  • Uploaded using Trusted Publishing? No
  • Uploaded via: uv/0.11.32 {"installer":{"name":"uv","version":"0.11.32","subcommand":["publish"]},"python":null,"implementation":{"name":null,"version":null},"distro":null,"system":{"name":null,"release":null},"cpu":null,"openssl_version":null,"setuptools_version":null,"rustc_version":null,"ci":null}

File hashes

Hashes for git_surgeon_cli-0.2.0.tar.gz
Algorithm Hash digest
SHA256 ec00601dc2e5cb70977d6381f845eedd9b0b091288b68fd525b7a3aaa8bc8161
MD5 2ebf4da4a29536c2e643346bb5ffdd40
BLAKE2b-256 fedb5cdfd34f61a4e94d4cf13419ef9b8b1e38c6c7251b248d092716f056ef5d

See more details on using hashes here.

File details

Details for the file git_surgeon_cli-0.2.0-py3-none-any.whl.

File metadata

  • Download URL: git_surgeon_cli-0.2.0-py3-none-any.whl
  • Upload date:
  • Size: 64.7 kB
  • Tags: Python 3
  • Uploaded using Trusted Publishing? No
  • Uploaded via: uv/0.11.32 {"installer":{"name":"uv","version":"0.11.32","subcommand":["publish"]},"python":null,"implementation":{"name":null,"version":null},"distro":null,"system":{"name":null,"release":null},"cpu":null,"openssl_version":null,"setuptools_version":null,"rustc_version":null,"ci":null}

File hashes

Hashes for git_surgeon_cli-0.2.0-py3-none-any.whl
Algorithm Hash digest
SHA256 80eef1df9dac907ae3ecd97968af13706032a1027538a41aa28efe54c35897c3
MD5 54bd950c4841b3cb003e53a045b185af
BLAKE2b-256 54f837fa85936a4367bd8eb7a3f02b81ec9afd11d7410dadaa34ed1ec107cc04

See more details on using hashes here.

Release history Release notifications | RSS feed

This release

0.2.0 This release

2 files

0.1.0

2 files

0.0.1.post2

2 files

0.0.1.post1

2 files

0.0.1

2 files

Anthropic, PBC Visionary sponsor Bloomberg Visionary sponsor Hudson River Trading Visionary sponsor Meta Visionary sponsor NVIDIA Visionary sponsor Microsoft Sustainability sponsor Depot Continuous Integration AWS Cloud computing and Security Sponsor Datadog Monitoring Fastly CDN Google Download Analytics Sentry Error logging StatusPage Status page