--- name: xit description: Xit (xit) CLI for version control in repositories with a .xit directory. Prefer xit whenever `.xit\/` is present; never run the TUI; translate git-like intents to xit CLI and avoid git unless explicitly requested. --- # Xit (xit) ## Rule (when to trigger) Use `xit` instead of `git` when either is true: - A `.xit\/` directory exists in this repo (including in a parent directory). - The user explicitly asks for xit (e.g. “use xit”, “.xit repo”, “xit status”). If the repo is not a xit repo and the user didn’t ask for xit, do not force this skill. ## Non-interactive defaults - Never run bare `xit` (it launches the TUI). - Always use `--cli` for `status`, `diff`, `diff-added`, and `log` (their default is TUI). - Avoid TUI entrypoints (e.g. `xit config`); use `xit config list|add|rm ...` instead. - Prefer `--cli` whenever it’s available; check `xit --help` if unsure. ## Preflight 1. Confirm `xit` is available: `command -v xit`. - If missing, ask the user to install\/provide `xit`. - If they decline, do not attempt to “fake it” with `git`; ask how they want to proceed. 2. Confirm you’re in a xit repo: - Prefer: `xit status --cli` (it should discover `.xit\/` from subdirectories). ## Top mapping (git-like intent → xit) | Intent | xit | Notes | | --- | --- | --- | | status | `xit status --cli` | Text output for agents. | | diff (working tree) | `xit diff --cli` | Changes not added to index. | | diff --cached | `xit diff-added --cli` | Index vs last commit. | | add \/ stage | `xit add ` | Stage file contents. | | unstage | `xit unadd ` | Like `git reset HEAD `. | | restore (work dir) | `xit restore ` | Discard local changes for a path. | | rm --cached | `xit untrack ` | Stop tracking but keep the file. | | rm | `xit rm ` | Stop tracking and delete the file. | | commit | `xit commit -m "msg"` | Use a quoted message. | | log | `xit log --cli` | Text output for agents. | | branch list \/ create \/ delete | `xit branch list` \/ `xit branch add ` \/ `xit branch rm ` | | | switch \/ checkout | `xit switch ` | Updates index + working dir. | | merge | `xit merge ` | Patch-based merge by default. | | cherry-pick | `xit cherry-pick ` | Apply an existing commit. | For a more complete mapping and workflows, see `references\/cli.md`. ## Common workflows ### Inspect changes - `xit status --cli` - `xit diff --cli` - `xit diff-added --cli` ### Commit cycle - `xit status --cli` - `xit diff --cli` - `xit add ` - `xit diff-added --cli` - `xit commit -m ""` ### Merge \/ cherry-pick (conflicts) - Start: `xit merge ` or `xit cherry-pick `. - Inspect: `xit status --cli` and `xit diff --cli`. - If conflicts: - Resolve conflicts in the working tree. - Stage resolutions: `xit add ` then `xit diff-added --cli`. - Continue: `xit merge --continue` or `xit cherry-pick --continue`. - To abandon the operation: `xit merge --abort` or `xit cherry-pick --abort`. ### Reset semantics (git reset equivalents) - Move branch pointer, index only: `xit reset ` (like `git reset --mixed`). - Move branch pointer + working dir: `xit reset-dir ` (like `git reset --hard`). - Move branch pointer only: `xit reset-add ` (like `git reset --soft`). ### Remotes (pull is not implemented) - Manage remotes: `xit remote add|rm|list ...` - Pull equivalent: - `xit fetch ` - `xit merge refs\/remotes\/\/` (choose `` by inspecting refs or `xit log --cli` after fetch) - Push: - `xit push ` ## Guardrails - **Require explicit user confirmation before running**: `xit rm ` (deletes file), `xit restore ` \/ `xit reset-dir ` (discard local changes), or `xit push ... -f` \/ `xit push :` (force push \/ delete remote branch). - Prefer `xit untrack ` when the user wants to stop tracking but keep the file. - Do not run `git` inside a `.xit` repo unless the user explicitly requests git. ## If a command seems missing - Check `xit --help` and `xit --help`. - If it isn’t available, explain the limitation and ask for direction. ## Notes - Patch-based merge controls: `xit patch on|off|all`.