From f2e2c5a094cbd273a6c8167fa3a7f6e4944c29d3 Mon Sep 17 00:00:00 2001 From: Nicolas Arnaud-Cormos Date: Fri, 25 Sep 2026 22:14:49 +0200 Subject: [PATCH 1/2] chore(main): release 0.25.0 --- .release-please-manifest.json | 2 +- CHANGELOG.md | 44 +++++++++++++++++++++++++++++++++++ Cargo.lock | 2 +- Cargo.toml | 2 +- 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index fc5553b0..945fbaf2 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.24.0" + ".": "0.25.0" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 25d11a2f..a11cc509 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,49 @@ # Changelog +## [0.25.0](https://github.com/narnaud/git-loom/compare/v0.24.0...v0.25.0) (2026-09-25) + + +### Features ✨ + +* **agent:** answer the -p hunk picker with data ([100b5b1](https://github.com/narnaud/git-loom/commit/100b5b177357e32277042c71936834f3fedd4189)) +* **agent:** emit the status graph as JSON on stdout ([24782cf](https://github.com/narnaud/git-loom/commit/24782cf18d9e6ec0759634381e20be5496e518ec)) +* **agent:** list an untracked file by size, not by content ([47910fa](https://github.com/narnaud/git-loom/commit/47910fad0e23314118497cf4c02f8944c15e5979)) +* **agent:** list working-tree hunks too, so -p is never refused ([9d8c3b9](https://github.com/narnaud/git-loom/commit/9d8c3b913fa7be032c75914dadd2dc5f04440a95)) +* **fold:** forward `git commit` options after `--` ([f940369](https://github.com/narnaud/git-loom/commit/f94036970f0daba89db86e1e61e087242fd33407)) +* **fold:** move a picked binary file whole with -p ([4b3c161](https://github.com/narnaud/git-loom/commit/4b3c1614752bba447ea7b690cedd62a1d7dc3e78)), closes [#272](https://github.com/narnaud/git-loom/issues/272) +* **rebase:** carry a rebase past a conflict `rerere` already resolved ([78f61fc](https://github.com/narnaud/git-loom/commit/78f61fcf9bbda903c39d0293598d8010496899b0)) +* **status:** put the abbreviated hash next to the short ID ([9c08ec8](https://github.com/narnaud/git-loom/commit/9c08ec8a4ee9dda9b5b50f474e882e52997cb70f)) +* **tui:** mark the source rows of a pending commit or fold ([6a95666](https://github.com/narnaud/git-loom/commit/6a95666a27d315399919df673a482d20fbd3f9b8)) +* **tui:** pick hunks with C before placing the commit ([8f1a63c](https://github.com/narnaud/git-loom/commit/8f1a63cd127d9cb51ed607956bb510efa739f3c9)) +* **tui:** title the hunk picker with the action it is for ([4274f75](https://github.com/narnaud/git-loom/commit/4274f7560174696dd84b3b0f45b9d917c1b4a8ae)) +* **tui:** walk the fold targets, tagged with what the fold does ([c668ad9](https://github.com/narnaud/git-loom/commit/c668ad994ba45f2678ee07fcec153ead83a891ce)) + + +### Bug Fixes 🐞 + +* **commit,absorb:** restore the staged patch before deleting the state file ([ce7c312](https://github.com/narnaud/git-loom/commit/ce7c3128ee9f5fd9b0c0b6c1bd3e1b002d2e9d6d)) +* put staged changes back when a rebase completes ([ec6ad96](https://github.com/narnaud/git-loom/commit/ec6ad9666c054e4d069ecae0f7aec41d779cb27b)) +* **rebase:** don't offer `loom drop` for a fold or absorb target ([da61bb4](https://github.com/narnaud/git-loom/commit/da61bb4d85b2c29f5fb1ae3ae667b612c072f991)) +* **staging:** never drop the staging set aside for a rewrite ([eb1aeac](https://github.com/narnaud/git-loom/commit/eb1aeac8517c41753939948c3d19525223afb26b)) +* **staging:** scope the unmerged-index hint to the paths it is about ([d63fe36](https://github.com/narnaud/git-loom/commit/d63fe36e7ce9e0a9abb8e5a833d517aa42d836fc)) +* **transaction:** roll back what a refused rebase already changed ([1a2e3c1](https://github.com/narnaud/git-loom/commit/1a2e3c1e5dffeb80bfaa83a114d7090faa553865)) + + +### Performance Improvements ⚡ + +* **tui:** read a pick's hunks on a worker, not on the loop ([b5c51e8](https://github.com/narnaud/git-loom/commit/b5c51e8a4d4bac767dd371003f4ba928fb87d698)) + + +### Changes + +* **tui:** Change `Fold/unfold` to `Open/close` ([bd487de](https://github.com/narnaud/git-loom/commit/bd487defd23465aaa57f675814df37c6c44b820a)) + + +### Other + +* **deps:** bump clap from 4.6.6 to 4.6.7 ([7b3b811](https://github.com/narnaud/git-loom/commit/7b3b8116d2dc84f3e9461261306e725baca6b35c)) +* **release:** credit commit authors in the changelog ([23fa92a](https://github.com/narnaud/git-loom/commit/23fa92ae0c8c3518d2f41de168bdfb9344d3da30)) + ## [0.24.0](https://github.com/narnaud/git-loom/compare/v0.23.0...v0.24.0) (2026-09-20) diff --git a/Cargo.lock b/Cargo.lock index 67f9a0f2..8237a6f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -620,7 +620,7 @@ dependencies = [ [[package]] name = "git-loom" -version = "0.24.0" +version = "0.25.0" dependencies = [ "anyhow", "chrono", diff --git a/Cargo.toml b/Cargo.toml index ebc92ca0..a5c9b82f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "git-loom" -version = "0.24.0" +version = "0.25.0" edition = "2024" rust-version = "1.90" description = "A Git CLI tool that weaves together multiple feature branches into integration branches" From 231c921d6a706941ab6704c8d9b83d8e1cf8e35e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 25 Sep 2026 20:14:53 +0000 Subject: [PATCH 2/2] chore(release): credit commit authors in the changelog --- CHANGELOG.md | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a11cc509..a5f939ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,44 +5,44 @@ ### Features ✨ -* **agent:** answer the -p hunk picker with data ([100b5b1](https://github.com/narnaud/git-loom/commit/100b5b177357e32277042c71936834f3fedd4189)) -* **agent:** emit the status graph as JSON on stdout ([24782cf](https://github.com/narnaud/git-loom/commit/24782cf18d9e6ec0759634381e20be5496e518ec)) -* **agent:** list an untracked file by size, not by content ([47910fa](https://github.com/narnaud/git-loom/commit/47910fad0e23314118497cf4c02f8944c15e5979)) -* **agent:** list working-tree hunks too, so -p is never refused ([9d8c3b9](https://github.com/narnaud/git-loom/commit/9d8c3b913fa7be032c75914dadd2dc5f04440a95)) -* **fold:** forward `git commit` options after `--` ([f940369](https://github.com/narnaud/git-loom/commit/f94036970f0daba89db86e1e61e087242fd33407)) +* **agent:** answer the -p hunk picker with data ([100b5b1](https://github.com/narnaud/git-loom/commit/100b5b177357e32277042c71936834f3fedd4189)) by @dfaure-kdab +* **agent:** emit the status graph as JSON on stdout ([24782cf](https://github.com/narnaud/git-loom/commit/24782cf18d9e6ec0759634381e20be5496e518ec)) by @narnaud +* **agent:** list an untracked file by size, not by content ([47910fa](https://github.com/narnaud/git-loom/commit/47910fad0e23314118497cf4c02f8944c15e5979)) by @dfaure-kdab +* **agent:** list working-tree hunks too, so -p is never refused ([9d8c3b9](https://github.com/narnaud/git-loom/commit/9d8c3b913fa7be032c75914dadd2dc5f04440a95)) by @dfaure-kdab +* **fold:** forward `git commit` options after `--` ([f940369](https://github.com/narnaud/git-loom/commit/f94036970f0daba89db86e1e61e087242fd33407)) by @dfaure-kdab * **fold:** move a picked binary file whole with -p ([4b3c161](https://github.com/narnaud/git-loom/commit/4b3c1614752bba447ea7b690cedd62a1d7dc3e78)), closes [#272](https://github.com/narnaud/git-loom/issues/272) -* **rebase:** carry a rebase past a conflict `rerere` already resolved ([78f61fc](https://github.com/narnaud/git-loom/commit/78f61fcf9bbda903c39d0293598d8010496899b0)) -* **status:** put the abbreviated hash next to the short ID ([9c08ec8](https://github.com/narnaud/git-loom/commit/9c08ec8a4ee9dda9b5b50f474e882e52997cb70f)) -* **tui:** mark the source rows of a pending commit or fold ([6a95666](https://github.com/narnaud/git-loom/commit/6a95666a27d315399919df673a482d20fbd3f9b8)) -* **tui:** pick hunks with C before placing the commit ([8f1a63c](https://github.com/narnaud/git-loom/commit/8f1a63cd127d9cb51ed607956bb510efa739f3c9)) -* **tui:** title the hunk picker with the action it is for ([4274f75](https://github.com/narnaud/git-loom/commit/4274f7560174696dd84b3b0f45b9d917c1b4a8ae)) -* **tui:** walk the fold targets, tagged with what the fold does ([c668ad9](https://github.com/narnaud/git-loom/commit/c668ad994ba45f2678ee07fcec153ead83a891ce)) +* **rebase:** carry a rebase past a conflict `rerere` already resolved ([78f61fc](https://github.com/narnaud/git-loom/commit/78f61fcf9bbda903c39d0293598d8010496899b0)) by @narnaud +* **status:** put the abbreviated hash next to the short ID ([9c08ec8](https://github.com/narnaud/git-loom/commit/9c08ec8a4ee9dda9b5b50f474e882e52997cb70f)) by @narnaud +* **tui:** mark the source rows of a pending commit or fold ([6a95666](https://github.com/narnaud/git-loom/commit/6a95666a27d315399919df673a482d20fbd3f9b8)) by @narnaud +* **tui:** pick hunks with C before placing the commit ([8f1a63c](https://github.com/narnaud/git-loom/commit/8f1a63cd127d9cb51ed607956bb510efa739f3c9)) by @narnaud +* **tui:** title the hunk picker with the action it is for ([4274f75](https://github.com/narnaud/git-loom/commit/4274f7560174696dd84b3b0f45b9d917c1b4a8ae)) by @narnaud +* **tui:** walk the fold targets, tagged with what the fold does ([c668ad9](https://github.com/narnaud/git-loom/commit/c668ad994ba45f2678ee07fcec153ead83a891ce)) by @narnaud ### Bug Fixes 🐞 -* **commit,absorb:** restore the staged patch before deleting the state file ([ce7c312](https://github.com/narnaud/git-loom/commit/ce7c3128ee9f5fd9b0c0b6c1bd3e1b002d2e9d6d)) -* put staged changes back when a rebase completes ([ec6ad96](https://github.com/narnaud/git-loom/commit/ec6ad9666c054e4d069ecae0f7aec41d779cb27b)) -* **rebase:** don't offer `loom drop` for a fold or absorb target ([da61bb4](https://github.com/narnaud/git-loom/commit/da61bb4d85b2c29f5fb1ae3ae667b612c072f991)) -* **staging:** never drop the staging set aside for a rewrite ([eb1aeac](https://github.com/narnaud/git-loom/commit/eb1aeac8517c41753939948c3d19525223afb26b)) -* **staging:** scope the unmerged-index hint to the paths it is about ([d63fe36](https://github.com/narnaud/git-loom/commit/d63fe36e7ce9e0a9abb8e5a833d517aa42d836fc)) -* **transaction:** roll back what a refused rebase already changed ([1a2e3c1](https://github.com/narnaud/git-loom/commit/1a2e3c1e5dffeb80bfaa83a114d7090faa553865)) +* **commit,absorb:** restore the staged patch before deleting the state file ([ce7c312](https://github.com/narnaud/git-loom/commit/ce7c3128ee9f5fd9b0c0b6c1bd3e1b002d2e9d6d)) by @narnaud +* put staged changes back when a rebase completes ([ec6ad96](https://github.com/narnaud/git-loom/commit/ec6ad9666c054e4d069ecae0f7aec41d779cb27b)) by @dfaure-kdab +* **rebase:** don't offer `loom drop` for a fold or absorb target ([da61bb4](https://github.com/narnaud/git-loom/commit/da61bb4d85b2c29f5fb1ae3ae667b612c072f991)) by @dfaure-kdab +* **staging:** never drop the staging set aside for a rewrite ([eb1aeac](https://github.com/narnaud/git-loom/commit/eb1aeac8517c41753939948c3d19525223afb26b)) by @narnaud +* **staging:** scope the unmerged-index hint to the paths it is about ([d63fe36](https://github.com/narnaud/git-loom/commit/d63fe36e7ce9e0a9abb8e5a833d517aa42d836fc)) by @narnaud +* **transaction:** roll back what a refused rebase already changed ([1a2e3c1](https://github.com/narnaud/git-loom/commit/1a2e3c1e5dffeb80bfaa83a114d7090faa553865)) by @narnaud ### Performance Improvements ⚡ -* **tui:** read a pick's hunks on a worker, not on the loop ([b5c51e8](https://github.com/narnaud/git-loom/commit/b5c51e8a4d4bac767dd371003f4ba928fb87d698)) +* **tui:** read a pick's hunks on a worker, not on the loop ([b5c51e8](https://github.com/narnaud/git-loom/commit/b5c51e8a4d4bac767dd371003f4ba928fb87d698)) by @narnaud ### Changes -* **tui:** Change `Fold/unfold` to `Open/close` ([bd487de](https://github.com/narnaud/git-loom/commit/bd487defd23465aaa57f675814df37c6c44b820a)) +* **tui:** Change `Fold/unfold` to `Open/close` ([bd487de](https://github.com/narnaud/git-loom/commit/bd487defd23465aaa57f675814df37c6c44b820a)) by @narnaud ### Other -* **deps:** bump clap from 4.6.6 to 4.6.7 ([7b3b811](https://github.com/narnaud/git-loom/commit/7b3b8116d2dc84f3e9461261306e725baca6b35c)) -* **release:** credit commit authors in the changelog ([23fa92a](https://github.com/narnaud/git-loom/commit/23fa92ae0c8c3518d2f41de168bdfb9344d3da30)) +* **deps:** bump clap from 4.6.6 to 4.6.7 ([7b3b811](https://github.com/narnaud/git-loom/commit/7b3b8116d2dc84f3e9461261306e725baca6b35c)) by @dependabot[bot] +* **release:** credit commit authors in the changelog ([23fa92a](https://github.com/narnaud/git-loom/commit/23fa92ae0c8c3518d2f41de168bdfb9344d3da30)) by @narnaud ## [0.24.0](https://github.com/narnaud/git-loom/compare/v0.23.0...v0.24.0) (2026-09-20)