summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Dilly <dilly.stephan@gmail.com>2021-03-03 22:13:06 +0100
committerStephan Dilly <dilly.stephan@gmail.com>2021-03-03 22:13:06 +0100
commitf84f6f458fd1978f6f962ec43faa582b3d294f23 (patch)
treeb2f382eb8527df68a53c5eda9c1cd81195cb7d0b
parent9d3fafaf001a03e16c004b22e23949f9dbf31358 (diff)
bump versionv0.12.0-rc1
-rw-r--r--CHANGELOG.md2
-rw-r--r--Cargo.lock4
-rw-r--r--Cargo.toml4
-rw-r--r--asyncgit/Cargo.toml2
4 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb05a12a..f0dc3a25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
+## [0.12.0] - 2020-03-03
+
**pull support (ff-merge or conflict-free merge-commit)**
![pull](assets/pull.gif)
diff --git a/Cargo.lock b/Cargo.lock
index a7a8bc7d..61c7aed1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -43,7 +43,7 @@ dependencies = [
[[package]]
name = "asyncgit"
-version = "0.11.0"
+version = "0.12.0"
dependencies = [
"crossbeam-channel",
"git2",
@@ -343,7 +343,7 @@ dependencies = [
[[package]]
name = "gitui"
-version = "0.11.0"
+version = "0.12.0-rc1"
dependencies = [
"anyhow",
"asyncgit",
diff --git a/Cargo.toml b/Cargo.toml
index a0cf5b1a..b3ff4457 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "gitui"
-version = "0.11.0"
+version = "0.12.0-rc1"
authors = ["Stephan Dilly <dilly.stephan@gmail.com>"]
description = "blazing fast terminal-ui for git"
edition = "2018"
@@ -20,7 +20,7 @@ keywords = [
[dependencies]
scopetime = { path = "./scopetime", version = "0.1" }
-asyncgit = { path = "./asyncgit", version = "0.11" }
+asyncgit = { path = "./asyncgit", version = "0.12" }
crossterm = { version = "0.19", features = [ "serde" ] }
clap = { version = "2.33", default-features = false }
tui = { version = "0.14", default-features = false, features = ['crossterm', 'serde'] }
diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
index 29a7ef69..d60f5ce0 100644
--- a/asyncgit/Cargo.toml
+++ b/asyncgit/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "asyncgit"
-version = "0.11.0"
+version = "0.12.0"
authors = ["Stephan Dilly <dilly.stephan@gmail.com>"]
edition = "2018"
description = "allow using git2 in a asynchronous context"