git-pincer 0.1.3 → 0.1.4

package/README.md

@@ -22,7 +22,7 @@ The name comes from Rust's mascot — the crab. A Git conflict is like two branc
 - **Three-pane merge UI** — local | result | remote, with chunk bands colored by change type using IDEA semantics: blue = modified, green = added, gray = deleted, red = conflict. Bands fade as chunks get resolved.
 - **Precise diff rendering** — delta-style word-level emphasis inside changed chunks, plus syntax highlighting (Maple theme via syntect, selected by file extension, gracefully disabled for huge files).
 - **Full flow takeover** — after all files are resolved it runs `git add` and the matching `--continue`, re-probes, and loops until the repository is clean. Multi-commit cherry-picks and multi-round rebases just work.
-- **RPG-style action menu** — running bare `git-pincer` in a clean repository opens a pixel-art menu with a status window that maps your repository to character vitals (Lv. = commit count, HP = uncommitted changes, MP = stashes, EXP = commits ahead). Pick an action, then a branch (merge / rebase) or a commit (cherry-pick / revert); success and failure both pop an in-TUI dialog and return to the menu — no flicker, no exit.
+- **RPG-style action menu** — running bare `git-pincer` in a clean repository opens a pixel-art menu with a status window that maps your repository to character vitals (Lv. = commit count, HP = uncommitted changes, MP = stashes, EXP = commits ahead). Pick an action, then a branch (merge / rebase / switch) or a commit (cherry-pick / revert); success and failure both pop an in-TUI dialog and return to the menu — no flicker, no exit.
 - **Broad conflict-source support** — merge, rebase, pull, cherry-pick, revert, `git am`, and even flows without a `--continue` such as `stash pop`, `checkout -m` or `apply --3way`.
 - **Native git, zero magic** — everything shells out to your git binary (the same route lazygit and IDEA take), so credentials, hooks, merge strategies and rerere all follow your existing configuration. Arguments are passed as arrays (no shell, no injection), and host `GIT_DIR`-style variables are scrubbed so nested invocations from hooks cannot hijack the wrong repository.
 - **Terminal-aware theming** — dark (Tokyo Night) and light (Maple Light) themes via `--theme <auto|dark|light>`, `COLORFGBG` auto-detection, and automatic xterm-256 quantization on terminals without truecolor support.
@@ -37,6 +37,12 @@ Requires `git` on your `PATH`.
 cargo install git-pincer
 ```
 
+Or via npm (prebuilt binary, no Rust toolchain needed):
+
+```bash
+npm install -g git-pincer
+```
+
 Prebuilt binaries for major platforms are also attached to [GitHub Releases](https://github.com/zlx2019/git-pincer/releases). To build from source (Rust 1.96+):
 
 ```bash
@@ -53,6 +59,7 @@ git-pincer rebase <branch>      # run git rebase, looping through every conflict
 git-pincer pull origin main     # arguments are passed straight to git pull
 git-pincer cherry-pick <commit> # multiple commits / options are passed through
 git-pincer revert <commit>      # run git revert and take over the conflicts
+git-pincer switch [branch]      # switch branches; remote ones get a local tracking branch (no arg opens a picker)
 git-pincer file conflict.txt    # git-free: parse a conflict-marked file, write it back
 git-pincer abort                # abort the operation in progress (with confirmation)
 git-pincer completions zsh      # shell completion script (bash/zsh/fish/powershell/elvish)
@@ -98,7 +105,7 @@ rpg_accent = "#ff7a2f"
 band_conflict = ["#3a1e22", "#5e2d35"]   # band_* / emph_* colors take a [normal, selected] pair
 ```
 
-Rebindable actions: `take-local`, `take-remote`, `ignore`, `undo`, `undo-file`, `edit`, `apply-all`, `next-change`, `prev-change`, `next-conflict`, `prev-conflict`, `copy-chunk`, `copy-file`, `copy-local`, `copy-remote`, `write`, `next-file`, `fold`, `quit`, `help`. Overridden keys show up in the hint bar and help overlay automatically. Unknown action names, key conflicts and invalid colors are rejected at startup with the full list of valid values.
+Rebindable actions: `take-local`, `take-remote`, `ignore`, `undo`, `undo-file`, `edit`, `apply-all`, `next-change`, `prev-change`, `next-conflict`, `prev-conflict`, `scroll-down`, `scroll-up`, `scroll-left`, `scroll-right`, `copy-chunk`, `copy-file`, `copy-local`, `copy-remote`, `write`, `next-file`, `fold`, `quit`, `help`. Overridden keys show up in the hint bar and help overlay automatically. Unknown action names, key conflicts and invalid colors are rejected at startup with the full list of valid values.
 
 Try the TUI without a git repository:
 
@@ -120,6 +127,7 @@ cp fixtures/conflict.txt /tmp/ && git-pincer file /tmp/conflict.txt
 | `j` / `k` | Move to the next / previous change chunk |
 | `n` / `p` | Jump to the next / previous unresolved conflict |
 | `Ctrl+d` / `Ctrl+u` | Scroll the viewport half a page down / up (navigation keys re-attach it to the cursor) |
+| `<` / `>` (or `Shift+←` / `Shift+→`) | Pan all three panes left / right on long lines (`…` marks clipped content) |
 | `y` / `Y` | Copy the current chunk result / the whole file result |
 | `H` / `L` | Copy the local / remote side of the current chunk |
 | `w` | Write the file (auto-applies remaining non-conflict changes, then `git add`) |

package/bin/git-pincer.js

@@ -1,13 +1,9 @@
 #!/usr/bin/env node
 "use strict";
 
-// git-pincer 的 npm 启动垫片:
-// 按当前平台定位 optionalDependencies 里对应的二进制子包, 并把参数原样转发给它。
-
 const { spawnSync } = require("node:child_process");
 const path = require("node:path");
 
-// 判断 Linux 是否为 musl 环境(运行时报告中没有 glibc 版本信息即视为 musl)
 function isMusl() {
   try {
     return !process.report.getReport().header.glibcVersionRuntime;
@@ -16,7 +12,6 @@ function isMusl() {
   }
 }
 
-// 根据平台与架构推导对应的二进制子包名, 不支持的平台返回 null
 function platformPackage() {
   const { platform, arch } = process;
   if (platform === "darwin" && arch === "arm64") return "@zero9501/git-pincer-darwin-arm64";
@@ -29,7 +24,6 @@ function platformPackage() {
   return null;
 }
 
-// 定位子包内的可执行文件绝对路径, 失败时输出指引并退出
 function binaryPath() {
   const pkg = platformPackage();
   if (!pkg) {
@@ -52,7 +46,6 @@ if (result.error) {
   process.exit(1);
 }
 if (result.signal) {
-  // 被信号终止时对自身重放同一信号, 让退出码符合 shell 约定(128+N)
   process.kill(process.pid, result.signal);
 }
 process.exit(result.status ?? 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-pincer",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A simple and efficient terminal Git conflict resolution CLI tool.",
   "keywords": [
     "git",
@@ -27,11 +27,11 @@
     "node": ">=16"
   },
   "optionalDependencies": {
-    "@zero9501/git-pincer-darwin-arm64": "0.1.3",
-    "@zero9501/git-pincer-darwin-x64": "0.1.3",
-    "@zero9501/git-pincer-linux-arm64-gnu": "0.1.3",
-    "@zero9501/git-pincer-linux-x64-gnu": "0.1.3",
-    "@zero9501/git-pincer-linux-x64-musl": "0.1.3",
-    "@zero9501/git-pincer-win32-x64": "0.1.3"
+    "@zero9501/git-pincer-darwin-arm64": "0.1.4",
+    "@zero9501/git-pincer-darwin-x64": "0.1.4",
+    "@zero9501/git-pincer-linux-arm64-gnu": "0.1.4",
+    "@zero9501/git-pincer-linux-x64-gnu": "0.1.4",
+    "@zero9501/git-pincer-linux-x64-musl": "0.1.4",
+    "@zero9501/git-pincer-win32-x64": "0.1.4"
   }
 }