Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b57e57f
simplify and focus use-case
epcim Nov 5, 2026
84467f4
add opencode
epcim Nov 5, 2026
962a128
feat: UX refresh — row listings, diffTool templates, .git exclusion, …
Nov 11, 2026
31db576
test: tolerate builtin help, cover no-path cd/wt CWD auto-detect; mat…
Nov 11, 2026
9aa6fd7
fix(just): apply cd/wt resolution ladder delta (CWD auto-detect) lost…
Nov 11, 2026
b9ec4ee
test: fix pre-existing harness defects — real smoke repo for 016 Go g…
Nov 11, 2026
60a1d2c
change opencode type
Nov 11, 2026
ff0a887
feat(cli): bare 'git cross' drops hint line and aligns columns on TTY
Nov 11, 2026
028cf39
fix(cli): portable diff/.git exclusion, working vim DirDiff command, …
Nov 11, 2026
b2d33d3
docs(agents): .git exclusion via .git-free mirror (no pathspec)
Nov 11, 2026
dbda066
feat(cli): nvim-first DirDiff default, help setup guidance, editor tests
Nov 11, 2026
41c1d1d
feat(cli): DIRDIFF_EXCLUDES / DIRDIFF_IGNORE env extras for default D…
Nov 11, 2026
bb7845c
feat(cli): shell-init + --clip; keep cd/wt adjacent in help
Nov 11, 2026
498f7d9
refactor(cli): park clipboard helper as dead code; correct worktree p…
Nov 11, 2026
4620aa9
release: 0.4.0
Nov 11, 2026
c12064d
feat(cli): enable rerere so conflict resolutions are reused on later …
Nov 11, 2026
4058580
feat(cli): restore completion command and ship cd wrappers with it
Nov 12, 2026
dc865c6
docs(help): show the explicit cross.diffTool command once
Nov 12, 2026
43e58c2
docs(help): show how to load completions and cd wrappers
Nov 12, 2026
42a0b6e
fix(cli): align the fzf patch picker and put local_path first
Nov 12, 2026
f07f3f0
feat(cli): concise update warning, review block, cross.dirdifftool
Nov 12, 2026
3e4da95
fixes for go-releaser
apealive Nov 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .agents/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ These files are shared repo-specific agent skills.

Current shared roles:

- `git-cross-maintainer.md` for safe code changes across Just, Go, and Rust
- `git-cross-maintainer.md` for safe code changes across supported Just/Fish and Go implementations
- `feature-spec-writer.md` for specs and behavior design work
- `safety-reviewer.md` for risky sync, push, patch, remove, and prune changes
- `safety-reviewer.md` for risky update, patch, remove, and prune changes
- `regression-tester.md` for focused and full regression planning

User-facing docs that mention these roles live in:
Expand Down
4 changes: 2 additions & 2 deletions .github/CICD.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ Added to README.md header:
### Creating a Release
```bash
# Tag and push
git tag v0.2.1
git push origin v0.2.1
git tag v0.4.0
git push origin v0.4.0

# GitHub Actions will automatically:
# 1. Create a release
Expand Down
53 changes: 4 additions & 49 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,59 +20,14 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.23'
cache-path: src-go
go-version: '1.24.4'
cache-path: src-go/go.sum
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v6
with:
distribution: goreleaser
version: latest
args: release --clean
args: release --clean --config ../.goreleaser.yaml
workdir: src-go
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

rust-build:
name: Build Rust Binaries
runs-on: ${{ matrix.os }}
strategy:
matrix:
include:
- os: ubuntu-latest
target: x86_64-unknown-linux-gnu
artifact_name: git-cross-rust-linux-amd64
- os: macos-latest
target: x86_64-apple-darwin
artifact_name: git-cross-rust-darwin-amd64
- os: macos-latest
target: aarch64-apple-darwin
artifact_name: git-cross-rust-darwin-arm64
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install Rust
uses: dtolnay/rust-toolchain@stable
with:
targets: ${{ matrix.target }}
- name: Build
run: cargo build --manifest-path src-rust/Cargo.toml --release --target ${{ matrix.target }}
- name: Upload Artifact
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.artifact_name }}
path: src-rust/target/${{ matrix.target }}/release/git-cross-rust

upload-rust-to-release:
name: Upload Rust to GitHub Release
needs: [goreleaser, rust-build]
runs-on: ubuntu-latest
steps:
- name: Download Artifacts
uses: actions/download-artifact@v4
with:
pattern: git-cross-rust-*
path: artifacts
- name: Upload to Release
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
files: artifacts/**/*
4 changes: 2 additions & 2 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ project_name: git-cross

before:
hooks:
- go mod tidy -C src-go
- go mod tidy .

builds:
- id: git-cross-go
main: ./src-go/main.go
main: ./main.go
binary: git-cross
env:
- CGO_ENABLED=0
Expand Down
2 changes: 1 addition & 1 deletion .specify/memory/constitution.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This constitutional document establishes the core principles governing the desig

**git-cross SHALL protect worktree cleanliness and prevent data loss.**

- Hidden worktrees (`.git/cross/worktrees/`) store upstream state
- Hidden worktrees (`.cross/worktrees/<remote>_<hash>`) store upstream state
- Automatic stashing before pulls preserves local modifications in worktrees
- Commands abort on dirty state when modifications could be lost
- Explicit confirmation required for destructive operations
Expand Down
151 changes: 78 additions & 73 deletions AGENTS.md

Large diffs are not rendered by default.

74 changes: 51 additions & 23 deletions CHANGELOG.md

Large diffs are not rendered by default.

16 changes: 7 additions & 9 deletions Justfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,26 @@ import? "git.just"

# Delegate all invocations to the full recipe set
[no-cd]
[positional-arguments]
@cross *ARGS:
REPO_DIR=$(git rev-parse --show-toplevel) \
USER_CWD=${USER_CWD:-$(pwd)} \
just --justfile "{{source_dir()}}/Justfile.cross" {{ARGS}}
just --justfile "{{source_dir()}}/Justfile.cross" "$@"

# keep compatibility with `just test-cross`
[no-cd]
[positional-arguments]
@cross-test *ARGS:
REPO_DIR=$(git rev-parse --show-toplevel) \
just --justfile "{{source_dir()}}/Justfile.cross" test "{{ARGS}}"

# Run the Rust implementation
[no-cd]
@cross-rust *ARGS:
cargo run --manifest-path "{{source_dir()}}/src-rust/Cargo.toml" -- {{ARGS}}
just --justfile "{{source_dir()}}/Justfile.cross" test "$@"

# Run the Go implementation
[no-cd]
[positional-arguments]
@cross-go *ARGS:
go run -C "{{source_dir()}}/src-go" main.go {{ARGS}}
go run -C "{{source_dir()}}/src-go" main.go "$@"

# Install git alias for git-cross (default: go)
# Install git alias for git-cross (Go or Just)
[no-cd]
@install impl="go":
just --justfile "{{source_dir()}}/Justfile.cross" install {{impl}}
Expand Down
Loading
Loading