From 2a991901a048053f086eb84578afc06134b83504 Mon Sep 17 00:00:00 2001 From: Peer Sommerlund Date: Wed, 28 Oct 2026 07:11:45 +0100 Subject: [PATCH 1/3] Note about octopus merge gleisbau 0.7.4 fixed octo-merges. git-graph 0.8.0 used gleisbau to fix octo-merges. --- CHANGELOG.md | 4 ++++ README.md | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c077e28..12c92c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Remove pager +### Fixed + +- Support octo-merges + ## [0.7.0] - 2025-11-14 diff --git a/README.md b/README.md index c085ba1..0ae521f 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,6 @@ git-graph --model my-model * Summaries of merge commits (i.e. 1st line of message) should not be modified! git-graph needs them to categorize merged branches. * Supports only the primary remote repository `origin`. -* Does currently not support "octopus merges" (i.e. no more than 2 parents) * On Windows PowerShell, piping to file output does not work properly (changes encoding), so you may want to use the default Windows console instead ## Contributing From a44c43f0adb2ce6641c8f316914cc1effc7f56ae Mon Sep 17 00:00:00 2001 From: Peer Sommerlund Date: Thu, 29 Oct 2026 00:31:35 +0100 Subject: [PATCH 2/3] Update dependencies --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce79538..3d9a536 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.30" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f710a23e6dbf193214fd46ca56a9d6864e550abe86202184532ae7275e46de19" +checksum = "ff20308ecabd635a2dc1dd5834a86c462cca20efba1d5d3ddab1f8aea3455cb2" dependencies = [ "cc", "libc", @@ -710,9 +710,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags", "errno", @@ -942,9 +942,9 @@ checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "unicode-width" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +checksum = "ca718471876992059f251e33aafc334346ada08042b7661dd1fe313a9bced557" [[package]] name = "utf8parse" From 2d96b996700311916bda9865d5c436d95c58351c Mon Sep 17 00:00:00 2001 From: Peer Sommerlund Date: Thu, 29 Oct 2026 00:28:59 +0100 Subject: [PATCH 3/3] Increment version to 0.8.3 --- CHANGELOG.md | 3 +++ Cargo.lock | 2 +- Cargo.toml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12c92c8..8a8cafd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [unreleased] - Next Date + +## [0.8.3] - 2026-10-29 + ### Fixed - Breaking a pipe no longer cause panic. diff --git a/Cargo.lock b/Cargo.lock index 3d9a536..496663c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -333,7 +333,7 @@ dependencies = [ [[package]] name = "git-graph" -version = "0.8.2" +version = "0.8.3" dependencies = [ "atty", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 1fc7c27..3129fa8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "git-graph" -version = "0.8.2" +version = "0.8.3" authors = ["Martin Lange "] description = "Command line tool to show clear git graphs arranged for your branching model" repository = "https://github.com/mlange-42/git-graph.git"