New Features
- add
gix merge commit --debug
This yields additional debugging information with details about detected conflicts. - add
gix merge commits
- add
gix merge tree
to merge trees similarly togit merge-tree
.
Bug Fixes
- assure that
gix tree diff
doesn't slow down too much when shortening IDs
Commit Statistics
- 18 commits contributed to the release.
- 4 commits were understood as conventional.
- 0 issues like '(#ID)' were seen in commit messages
Commit Details
view details
- Uncategorized
- Release gix-date v0.9.2, gix-actor v0.33.1, gix-hash v0.15.1, gix-features v0.39.1, gix-validate v0.9.2, gix-object v0.46.0, gix-path v0.10.13, gix-quote v0.4.14, gix-attributes v0.23.1, gix-packetline-blocking v0.18.1, gix-filter v0.15.0, gix-chunk v0.4.10, gix-commitgraph v0.25.1, gix-revwalk v0.17.0, gix-traverse v0.43.0, gix-worktree-stream v0.17.0, gix-archive v0.17.0, gix-config-value v0.14.10, gix-lock v15.0.1, gix-ref v0.49.0, gix-config v0.42.0, gix-prompt v0.8.9, gix-url v0.28.1, gix-credentials v0.25.1, gix-bitmap v0.2.13, gix-index v0.37.0, gix-worktree v0.38.0, gix-diff v0.48.0, gix-discover v0.37.0, gix-pathspec v0.8.1, gix-dir v0.10.0, gix-mailmap v0.25.1, gix-revision v0.31.0, gix-merge v0.1.0, gix-negotiate v0.17.0, gix-pack v0.55.0, gix-odb v0.65.0, gix-packetline v0.18.1, gix-transport v0.43.1, gix-protocol v0.46.1, gix-refspec v0.27.0, gix-status v0.15.0, gix-submodule v0.16.0, gix-worktree-state v0.15.0, gix v0.68.0, gix-fsck v0.8.0, gitoxide-core v0.43.0, gitoxide v0.39.0, safety bump 25 crates (8ce4912)
- Prepare changelogs prior to release (bc9d994)
- Merge pull request #1661 from GitoxideLabs/merge (0b7abfb)
- Add
gix merge commit --debug
(0a5993f) - Adapt to changes in
gix-merge
. (47110d6) - Merge pull request #1662 from paolobarbolini/thiserror-v2 (7a40648)
- Upgrade thiserror to v2.0.0 (0f0e4fe)
- Merge pull request #1658 from GitoxideLabs/merge (905e5b4)
- Add
gix merge commits
(4a5afc7) - Merge pull request #1651 from GitoxideLabs/merge (a876533)
- Adapt to changes in
gix
(8d590f3) - Adapt to changes in
gix
(589ee8e) - Merge pull request #1618 from GitoxideLabs/merge (3fb989b)
- Add
gix merge tree
to merge trees similarly togit merge-tree
. (84707c2) - Adapt to changes in
gix-object
andgix-odb
(96488f7) - Adapt to changes in
gix-merge
(278dd88) - Assure that
gix tree diff
doesn't slow down too much when shortening IDs (32d6bfb) - Merge pull request #1642 from GitoxideLabs/new-release (db5c9cf)