Everyday git integration.

Added

• make git-config-simple — one-shot setup: mergetool + difftool + two aliases:
  • git gd [<rev>] [--staged] → all working changes in one gdf window
  • git gm <branch> → merge, and if it conflicts, gdf opens to resolve

Bare git merge / git diff can't be remapped (builtins), so these short aliases are the practical path. README has a "Git integration (TL;DR)" section.

Binaries for linux/macOS/windows (amd64/arm64) attached with checksums.txt. macOS is unsigned — xattr -d com.apple.quarantine gdf.

git-aware diffing.

Added

• gdf git [<rev>] [--staged] — view all working-tree (or index) changes in one window: file-list sidebar with M/A/D/R/U status + per-file counts, ref-labeled panes (HEAD vs working tree/index). Untracked files included.
• difftool support — make git-config wires difftool.gdf + diff.tool; git difftool works per file.

Fixed

• Diff mode reads a missing/deleted side as empty instead of erroring — git difftool now works on added/deleted files.

Binaries for linux/macOS/windows (amd64/arm64) attached with checksums.txt. macOS is unsigned — xattr -d com.apple.quarantine gdf.

Licensing release. No code changes since v1.0.0.

• Add LICENSE (MIT).
• Add NOTICE — retains the bundled dependency notices: sergi/go-diff is MIT and carries Apache-2.0 (its Google diff-match-patch heritage). Both permissive; no copyleft on gdf.

Binaries for linux/macOS/windows (amd64/arm64) attached with checksums.txt. macOS is unsigned — clear Gatekeeper once: xattr -d com.apple.quarantine gdf.

First release.

A meld-flavored side-by-side diff & merge tool that renders in a Chrome app window. The Go binary is the running git mergetool: pick ours/theirs/both per conflict, it reassembles the file, writes it back, exits.

Highlights

• Merge mode — parses conflict markers (2-way + diff3), per-conflict ours/theirs/both/base/skip, writes the result back. Drops into git mergetool.
• Diff mode — side-by-side two-file compare.
• Intra-line char highlighting, syntax highlighting, light/dark theme, branch + filename headers, dual gutters.
• Vanilla JS/CSS/SVG. One hash-pinned Go dependency. Single static cross-platform binary.

Install

Binaries for linux/macOS/windows (amd64/arm64) are attached below with checksums.txt. Verify, extract, run. See the README for go install and build-from-source.

macOS binaries are unsigned — clear Gatekeeper once: xattr -d com.apple.quarantine gdf.