Skip to content

Commit cf0c7ee

Browse files
authored
Merge pull request #1659 from GitoxideLabs/merge
merge-base octopus
2 parents 905e5b4 + 65ae68e commit cf0c7ee

30 files changed

+564
-342
lines changed

Cargo.lock

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crate-status.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -621,6 +621,8 @@ Make it the best-performing implementation and the most convenient one.
621621

622622
### gix-revision
623623
* [x] `describe()` (similar to `git name-rev`)
624+
* [x] merge-base
625+
* [x] merge-base octopus
624626
* parse specifications
625627
* [x] parsing and navigation
626628
* [x] revision ranges

gix-revision/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ document-features = { version = "0.2.1", optional = true }
4444
[dev-dependencies]
4545
gix-odb = { path = "../gix-odb" }
4646
gix-testtools = { path = "../tests/tools" }
47+
permutohedron = "0.2.4"
4748

4849
[package.metadata.docs.rs]
4950
all-features = true

gix-revision/src/merge_base.rs

Lines changed: 0 additions & 251 deletions
This file was deleted.

0 commit comments

Comments
 (0)