diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30caa5b..3926163 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.17.60] - 2026-09-17
+
+### Fixed
+
+- Handling of single-commit condition in `commitlint` functionality (in `stavefile.go`).
+
 ## [0.17.59] - 2026-09-16
 
 ### Changed
@@ -791,7 +797,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [0.4.0] - 2025-10-30
 
-[unreleased]: https://github.com/preminger/goctx/compare/v0.17.59...HEAD
+[unreleased]: https://github.com/preminger/goctx/compare/v0.17.60...HEAD
+[0.17.60]: https://github.com/preminger/goctx/compare/v0.17.59...v0.17.60
 [0.17.59]: https://github.com/preminger/goctx/compare/v0.17.58...v0.17.59
 [0.17.58]: https://github.com/preminger/goctx/compare/v0.17.57...v0.17.58
 [0.17.57]: https://github.com/preminger/goctx/compare/v0.17.56...v0.17.57
diff --git a/go.mod b/go.mod
index 2437003..d3c8bbf 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/sebdah/goldie/v2 v2.8.0
 	github.com/spf13/cobra v1.10.2
 	github.com/stretchr/testify v1.12.1
-	github.com/yaklabco/stave v0.17.2
+	github.com/yaklabco/stave v0.17.3
 	golang.org/x/sync v0.23.0
 	golang.org/x/tools v0.50.0
 )
diff --git a/go.sum b/go.sum
index b2958bd..d562ce1 100644
--- a/go.sum
+++ b/go.sum
@@ -147,8 +147,8 @@ github.com/xo/terminfo v1.2.0 h1:d0ZTOCpuGE0lwSAOs0zcJjwz3jWQyqcRt9XbGJpCOl4=
 github.com/xo/terminfo v1.2.0/go.mod h1:lGzkSo8Fe7IRh/w+Gqz7n5mDog4FVXCj3gy/DYTBqio=
 github.com/yaklabco/direnv/v2 v2.37.2-0.20260915190823-63179e7acdb7 h1:FbyprtPeV4uHT+z+g88+UAGVGGhlIkpoxDqY+Eoq3nI=
 github.com/yaklabco/direnv/v2 v2.37.2-0.20260915190823-63179e7acdb7/go.mod h1:sJDi3wKT+98Gbbbr1fsSl5MccL8PxZbRK5X6sX5RpNo=
-github.com/yaklabco/stave v0.17.2 h1:Kmzix6D3V/Tzn86LWRuSVnZwBCRfxv2WAvK01gxg15c=
-github.com/yaklabco/stave v0.17.2/go.mod h1:GUKIl1ldxReHDm/Px2r+V5WAdUbJuWkcXq4MVUtdSNM=
+github.com/yaklabco/stave v0.17.3 h1:eX5HePvHXnWXQmocbtFOcy/1IBItz18j+RiPKvUvCSs=
+github.com/yaklabco/stave v0.17.3/go.mod h1:GUKIl1ldxReHDm/Px2r+V5WAdUbJuWkcXq4MVUtdSNM=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw=
 go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg=
diff --git a/stavefile.go b/stavefile.go
index 0d12cd4..3f26b7d 100644
--- a/stavefile.go
+++ b/stavefile.go
@@ -870,6 +870,9 @@ func commitlintHookWorker(pushRefs []changelog.PushRef) error {
 			}
 			remoteSHA = strings.TrimSpace(out)
 		}
+		if remoteSHA == ref.LocalSHA {
+			remoteSHA += "^"
+		}
 
 		out, err := sh.Output("commitlint", "--from", remoteSHA, "--to", ref.LocalSHA)
 		if err != nil {