Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.16.0"
".": "0.16.1"
}
23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# Changelog

## [0.16.1](https://github.com/narnaud/git-loom/compare/v0.16.0...v0.16.1) (2026-03-24)


### Bug Fixes 🐞

* **merge:** handle conflicts in loom branch merge with continue/abort support ([1cc14b6](https://github.com/narnaud/git-loom/commit/1cc14b6c72317e24f0e6826e9e91bd8787bc7ef3))
* **push:** fix Azure DevOps PR creation on Windows ([c9fb030](https://github.com/narnaud/git-loom/commit/c9fb030c13af5ba13ca6913109937c4b81b0c0d2))
* **shortid:** only avoid exact ID collisions, not shared first letters ([0b5d8d5](https://github.com/narnaud/git-loom/commit/0b5d8d5a32bb8d831bc32842702c57c75b47feae))
* **trace:** append abort/continue to the originating command trace ([22561a4](https://github.com/narnaud/git-loom/commit/22561a4cf4ee3367ed5bae465d3842338aef5203))
* **update:** handle inverted merge parent ordering in weave topology ([cce12a9](https://github.com/narnaud/git-loom/commit/cce12a97cdaff97d0be3a1e55d338003ec3d9b3d))
* **update:** use consistent diff engine for patch-ID matching ([e98d4f2](https://github.com/narnaud/git-loom/commit/e98d4f22443fe7f454342bed6f3e32549ed78902))
* **update:** use weave-based rebase to prevent upstream commits leaking into feature branches ([7069d5c](https://github.com/narnaud/git-loom/commit/7069d5cf3d34d1656aa30011bd9e0f5ed83459ce))


### Performance Improvements ⚡

* **update:** replace patch-ID pipeline with git cherry for cherry-pick detection ([daa6eae](https://github.com/narnaud/git-loom/commit/daa6eaeb55faaf521d81aab7512583ace00b5a01))


### Changes

* replace raw git calls with run_git_stdout ([c626733](https://github.com/narnaud/git-loom/commit/c626733ef8dcb839e1e17f70a6dde9a5193a0d17))

## [0.16.0](https://github.com/narnaud/git-loom/compare/v0.15.1...v0.16.0) (2026-03-21)


Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "git-loom"
version = "0.16.0"
version = "0.16.1"
edition = "2024"
rust-version = "1.90"
description = "A Git CLI tool that weaves together multiple feature branches into integration branches"
Expand Down
Loading