Cargo.lock: Updating tracing v0.1.36 -> v0.1.37

dependencies: Update serde_json to 1.0.86
dependencies: Update clap to 4.0.11
2022-10-10 18:06:27 +02:00 · 2022-10-10 18:06:25 +02:00 · 2022-10-10 18:06:25 +02:00 · 2022-10-06 12:59:56 +02:00 · 2022-10-06 12:38:32 +02:00 · 2022-10-06 12:38:32 +02:00
36 changed files with 1233 additions and 832 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,53 +1,3 @@
-# Contributing
-
-GRM is still in very early development. I started GRM mainly to scratch my own
-itches (and am heavily dogfooding it). If you have a new use case for GRM, go
-for it!
-
-The branching strategy is a simplified
-[git-flow](https://nvie.com/posts/a-successful-git-branching-model/).
-
-* `master` is the "production" branch. Each commit is a new release.
-* `develop` is the branch where new stuff is coming in.
-* feature branches branch off of `develop` and merge back into it.
-
-So to contribute, just fork the repo and create a pull request against
-`develop`. If you plan bigger changes, please consider opening an issue first,
-so we can discuss it.
-
-If you want, add yourself to the `CONTRIBUTORS` file in your pull request.
-
-## Code formatting
-
-For Rust, just use `cargo fmt`. For Python, use
-[black](https://github.com/psf/black). I'd rather not spend any effort in
-configuring the formatters (not possible for black anyway). For shell scripts,
-use [`shfmt`](https://github.com/mvdan/sh).
-
-## Tooling
-
-GRM uses [`just`](https://github.com/casey/just) as a command runner. See
-[here](https://github.com/casey/just#installation) for installation
-instructions (it's most likely just a simple `cargo install just`).
-
-## Testing
-
-There are two distinct test suites: One for unit test (`just test-unit`) and
-integration tests (`just test-integration`) that is part of the rust crate, and
-a separate e2e test suite in python (`just test-e2e`).
-
-To run all tests, run `just test`.
-
-When contributing, consider whether it makes sense to add tests which could
-prevent regressions in the future. When fixing bugs, it makes sense to add
-tests that expose the wrong behaviour beforehand.
-
-To also ensure proper formatting and that the linter is happy, use `just check`.
-If that succeeds, your code is most likely fine to push!
-
-## Documentation
-
-The documentation lives in `docs` and uses
-[mdBook](https://github.com/rust-lang/mdBook). Please document new user-facing
-features here!
-
+Check out [the developer
+documentation](https://hakoerber.github.io/git-repo-manager/developing.html) it
+you want to contribute!
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,18 +4,18 @@ version = 3

 [[package]]
 name = "aho-corasick"
-version = "0.7.18"
+version = "0.7.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
+checksum = "b4f55bd91a0978cbfd91c457a164bab8b4001c833b7f323132c0a4e1922dd44e"
 dependencies = [
 "memchr",
 ]

 [[package]]
 name = "async-channel"
-version = "1.6.1"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
+checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28"
 dependencies = [
 "concurrent-queue",
 "event-listener",
@@ -47,9 +47,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bytes"
-version = "1.1.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
+checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"

 [[package]]
 name = "cache-padded"
@@ -80,26 +80,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "3.2.7"
+version = "4.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b7b16274bb247b45177db843202209b12191b631a14a9d06e41b3777d6ecf14"
+checksum = "4ed45cc2c62a3eff523e718d8576ba762c83a3146151093283ac62ae11933a73"
 dependencies = [
 "atty",
 "bitflags",
 "clap_derive",
 "clap_lex",
- "indexmap",
 "once_cell",
 "strsim",
 "termcolor",
- "textwrap",
 ]

 [[package]]
 name = "clap_derive"
-version = "3.2.7"
+version = "4.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "759bf187376e1afa7b85b959e6a664a3e7a95203415dba952ad19139e798f902"
+checksum = "db342ce9fda24fb191e2ed4e102055a4d381c1086a06630174cd8da8d5d917ce"
 dependencies = [
 "heck",
 "proc-macro-error",
@@ -110,18 +108,18 @@ dependencies = [

 [[package]]
 name = "clap_lex"
-version = "0.2.4"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
 dependencies = [
 "os_str_bytes",
 ]

 [[package]]
 name = "comfy-table"
-version = "6.0.0"
+version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "121d8a5b0346092c18a4b2fd6f620d7a06f0eb7ac0a45860939a0884bc579c56"
+checksum = "85914173c2f558d61613bfbbf1911f14e630895087a7ed2fafc0f5319e1536e7"
 dependencies = [
 "crossterm",
 "strum",
@@ -131,23 +129,22 @@ dependencies = [

 [[package]]
 name = "concurrent-queue"
-version = "1.2.2"
+version = "1.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c"
 dependencies = [
 "cache-padded",
 ]

 [[package]]
 name = "console"
-version = "0.15.0"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
+checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c"
 dependencies = [
 "encode_unicode",
+ "lazy_static",
 "libc",
- "once_cell",
- "regex",
 "terminal_size",
 "unicode-width",
 "winapi",
@@ -155,19 +152,18 @@ dependencies = [

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.10"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83"
+checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac"
 dependencies = [
 "cfg-if",
- "once_cell",
 ]

 [[package]]
 name = "crossterm"
-version = "0.23.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17"
+checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
 dependencies = [
 "bitflags",
 "crossterm_winapi",
@@ -190,9 +186,9 @@ dependencies = [

 [[package]]
 name = "curl"
-version = "0.4.43"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d855aeef205b43f65a5001e0997d81f8efca7badad4fad7d897aa7f0d0651f"
+checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
 dependencies = [
 "curl-sys",
 "libc",
@@ -205,9 +201,9 @@ dependencies = [

 [[package]]
 name = "curl-sys"
-version = "0.4.55+curl-7.83.1"
+version = "0.4.56+curl-7.83.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23734ec77368ec583c2e61dd3f0b0e5c98b93abe6d2a004ca06b91dd7e3e2762"
+checksum = "6093e169dd4de29e468fa649fbae11cdcd5551c81fe5bf1b0677adad7ef3d26f"
 dependencies = [
 "cc",
 "libc",
@@ -220,20 +216,19 @@ dependencies = [
 ]

 [[package]]
-name = "dirs-next"
-version = "2.0.0"
+name = "dirs"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
 dependencies = [
- "cfg-if",
- "dirs-sys-next",
+ "dirs-sys",
 ]

 [[package]]
-name = "dirs-sys-next"
-version = "0.1.2"
+name = "dirs-sys"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
 dependencies = [
 "libc",
 "redox_users",
@@ -257,15 +252,15 @@ dependencies = [

 [[package]]
 name = "event-listener"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"

 [[package]]
 name = "fastrand"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499"
 dependencies = [
 "instant",
 ]
@@ -278,11 +273,10 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "form_urlencoded"
-version = "1.0.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
 dependencies = [
- "matches",
 "percent-encoding",
 ]

@@ -294,15 +288,15 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"

 [[package]]
 name = "futures-core"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"

 [[package]]
 name = "futures-io"
-version = "0.3.21"
+version = "0.3.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"

 [[package]]
 name = "futures-lite"
@@ -332,7 +326,7 @@ dependencies = [

 [[package]]
 name = "git-repo-manager"
-version = "0.7.4"
+version = "0.7.9"
 dependencies = [
 "clap",
 "comfy-table",
@@ -352,9 +346,9 @@ dependencies = [

 [[package]]
 name = "git2"
-version = "0.14.4"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0155506aab710a86160ddb504a480d2964d7ab5b9e62419be69e0032bc5931c"
+checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1"
 dependencies = [
 "bitflags",
 "libc",
@@ -367,9 +361,9 @@ dependencies = [

 [[package]]
 name = "hashbrown"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"

 [[package]]
 name = "heck"
@@ -399,11 +393,10 @@ dependencies = [

 [[package]]
 name = "idna"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
 dependencies = [
- "matches",
 "unicode-bidi",
 "unicode-normalization",
 ]
@@ -458,15 +451,15 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
+checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"

 [[package]]
 name = "jobserver"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
 dependencies = [
 "libc",
 ]
@@ -479,15 +472,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"

 [[package]]
 name = "libgit2-sys"
-version = "0.13.4+1.4.2"
+version = "0.14.0+1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0fa6563431ede25f5cc7f6d803c6afbc1c5d3ad3d4925d12c882bf2b526f5d1"
+checksum = "47a00859c70c8a4f7218e6d1cc32875c4b55f6799445b842b0d8ed5e4c3d959b"
 dependencies = [
 "cc",
 "libc",
@@ -533,17 +526,11 @@ dependencies = [
 "vcpkg",
 ]

-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
 [[package]]
 name = "lock_api"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
 dependencies = [
 "autocfg",
 "scopeguard",
@@ -558,12 +545,6 @@ dependencies = [
 "cfg-if",
 ]

-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -590,9 +571,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.12.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
+checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"

 [[package]]
 name = "openssl-probe"
@@ -602,18 +583,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

 [[package]]
 name = "openssl-src"
-version = "111.21.0+1.1.1p"
+version = "111.22.0+1.1.1q"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0a8313729211913936f1b95ca47a5fc7f2e04cd658c115388287f8a8361008"
+checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
 dependencies = [
 "cc",
 ]

 [[package]]
 name = "openssl-sys"
-version = "0.9.74"
+version = "0.9.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1"
+checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce"
 dependencies = [
 "autocfg",
 "cc",
@@ -625,9 +606,9 @@ dependencies = [

 [[package]]
 name = "os_str_bytes"
-version = "6.1.0"
+version = "6.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
+checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"

 [[package]]
 name = "parking"
@@ -671,24 +652,24 @@ dependencies = [

 [[package]]
 name = "percent-encoding"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"

 [[package]]
 name = "pin-project"
-version = "1.0.10"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e"
+checksum = "ad29a609b6bcd67fee905812e544992d216af9d755757c05ed2d0e15a74c6ecc"
 dependencies = [
 "pin-project-internal",
 ]

 [[package]]
 name = "pin-project-internal"
-version = "1.0.10"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb"
+checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -709,10 +690,11 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"

 [[package]]
 name = "polling"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+checksum = "899b00b9c8ab553c743b3e11e87c5c7d423b2a2de229ba95b24a756344748011"
 dependencies = [
+ "autocfg",
 "cfg-if",
 "libc",
 "log",
@@ -746,18 +728,18 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.40"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.20"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
+checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
 dependencies = [
 "proc-macro2",
 ]
@@ -801,9 +783,9 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.2.13"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
 dependencies = [
 "bitflags",
 ]
@@ -821,9 +803,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.5.6"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
+checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -832,9 +814,9 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.6.26"
+version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
+checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"

 [[package]]
 name = "remove_dir_all"
@@ -847,15 +829,15 @@ dependencies = [

 [[package]]
 name = "rustversion"
-version = "1.0.7"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf"
+checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8"

 [[package]]
 name = "ryu"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
+checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"

 [[package]]
 name = "schannel"
@@ -875,18 +857,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"

 [[package]]
 name = "serde"
-version = "1.0.137"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
+checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.137"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
+checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -895,9 +877,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7"
+checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074"
 dependencies = [
 "itoa",
 "ryu",
@@ -906,23 +888,24 @@ dependencies = [

 [[package]]
 name = "serde_yaml"
-version = "0.8.24"
+version = "0.9.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707d15895415db6628332b737c838b88c598522e4dc70647e59b72312924aebc"
+checksum = "8613d593412a0deb7bbd8de9d908efff5a0cb9ccd8f62c641e7b2ed2f57291d1"
 dependencies = [
 "indexmap",
+ "itoa",
 "ryu",
 "serde",
- "yaml-rust",
+ "unsafe-libyaml",
 ]

 [[package]]
 name = "shellexpand"
-version = "2.1.0"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83bdb7831b2d85ddf4a7b148aa19d0587eddbe8671a436b7bd1182eaad0f2829"
+checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4"
 dependencies = [
- "dirs-next",
+ "dirs",
 ]

 [[package]]
@@ -957,9 +940,12 @@ dependencies = [

 [[package]]
 name = "slab"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
+checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
+dependencies = [
+ "autocfg",
+]

 [[package]]
 name = "sluice"
@@ -974,15 +960,15 @@ dependencies = [

 [[package]]
 name = "smallvec"
-version = "1.8.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"

 [[package]]
 name = "socket2"
-version = "0.4.4"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd"
 dependencies = [
 "libc",
 "winapi",
@@ -1002,9 +988,9 @@ checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"

 [[package]]
 name = "strum_macros"
-version = "0.24.2"
+version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4faebde00e8ff94316c01800f9054fd2ba77d30d9e922541913051d1d978918b"
+checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -1015,9 +1001,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.98"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
+checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1053,26 +1039,20 @@ dependencies = [
 "winapi",
 ]

-[[package]]
-name = "textwrap"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
 [[package]]
 name = "thiserror"
-version = "1.0.31"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
+checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.31"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
+checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1105,9 +1085,9 @@ dependencies = [

 [[package]]
 name = "tracing"
-version = "0.1.35"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
 "cfg-if",
 "log",
@@ -1118,9 +1098,9 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1129,9 +1109,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
 dependencies = [
 "once_cell",
 ]
@@ -1154,34 +1134,39 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"

 [[package]]
 name = "unicode-ident"
-version = "1.0.1"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
+checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"

 [[package]]
 name = "unicode-normalization"
-version = "0.1.20"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dee68f85cab8cf68dec42158baf3a79a1cdc065a8b103025965d6ccb7f6cbd"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
 "tinyvec",
 ]

 [[package]]
 name = "unicode-width"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1e5fa573d8ac5f1a856f8d7be41d390ee973daf97c806b2c1a465e4e1406e68"

 [[package]]
 name = "url"
-version = "2.2.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
 dependencies = [
 "form_urlencoded",
 "idna",
- "matches",
 "percent-encoding",
 ]

@@ -1300,12 +1285,3 @@ name = "windows_x86_64_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "git-repo-manager"
-version = "0.7.4"
+version = "0.7.9"
 edition = "2021"

 authors = [
@@ -44,33 +44,33 @@ path = "src/grm/main.rs"
 version = "=0.5.9"

 [dependencies.serde]
-version = "=1.0.137"
+version = "=1.0.145"
 features = ["derive"]

 [dependencies.git2]
-version = "=0.14.4"
+version = "=0.15.0"

 [dependencies.shellexpand]
-version = "=2.1.0"
+version = "=2.1.2"

 [dependencies.clap]
-version = "=3.2.7"
+version = "=4.0.11"
 features = ["derive", "cargo"]

 [dependencies.console]
-version = "=0.15.0"
+version = "=0.15.2"

 [dependencies.regex]
-version = "=1.5.6"
+version = "=1.6.0"

 [dependencies.comfy-table]
-version = "=6.0.0"
+version = "=6.1.0"

 [dependencies.serde_yaml]
-version = "=0.8.24"
+version = "=0.9.13"

 [dependencies.serde_json]
-version = "=1.0.82"
+version = "=1.0.86"

 [dependencies.isahc]
 version = "=1.7.2"
--- a/19
+++ b/19
@@ -1,5 +1,7 @@
 set positional-arguments

+set shell := ["/bin/bash", "-c"]
+
 static_target := "x86_64-unknown-linux-musl"

 check: fmt-check lint test
@@ -26,12 +28,22 @@ lint:
 lint-fix:
    cargo clippy --no-deps --fix

-release:
+build-release:
    cargo build --release

-release-static:
+build-release-static:
    cargo build --release --target {{static_target}} --features=static-build

+pushall:
+    for r in $(git remote) ; do \
+        for branch in develop master ; do \
+            git push $r $branch ; \
+        done ; \
+    done
+
+release-patch:
+    ./release.sh patch
+
 test-binary:
    env \
        GITHUB_API_BASEURL=http://rest:5000/github \
@@ -77,3 +89,6 @@ update-cargo-dependencies:
    && . ./venv/bin/activate \
    && pip --disable-pip-version-check install -r ./requirements.txt > /dev/null \
    && ./update-cargo-dependencies.py
+
+wait:
+    read -p "[ENTER] to continue "
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
 # GRM — Git Repository Manager

 GRM helps you manage git repositories in a declarative way. Configure your
-repositories in a [TOML](https://toml.io/) file, GRM does the rest.
+repositories in a [TOML](https://toml.io/) or YAML file, GRM does the rest.
+
+Also, GRM can be used to work with git worktrees in an opinionated,
+straightforward fashion.

 **Take a look at the [official documentation](https://hakoerber.github.io/git-repo-manager/)
 for installation & quickstart.**
@@ -34,23 +37,26 @@ like Terraform for your local git repositories. Write a config, run the tool, an
 your repos are ready. The only thing that is tracked by git it the list of
 repositories itself.

-# Future & Ideas
-
-* Operations over all repos (e.g. pull)
-* Show status of managed repositories (dirty, compare to remotes, ...)
-
-# Optional Features
-
-* Support multiple file formats (YAML, JSON).
-* Add systemd timer unit to run regular syncs
-
 # Crates

-* [`toml`](https://docs.rs/toml/) for the configuration file
-* [`serde`](https://docs.rs/serde/) because we're using Rust, after all
-* [`git2`](https://docs.rs/git2/), a safe wrapper around `libgit2`, for all git operations
-* [`clap`](https://docs.rs/clap/), [`console`](https://docs.rs/console/) and [`shellexpand`](https://docs.rs/shellexpand) for good UX
+* [`toml`](https://docs.rs/toml/) for the configuration file.
+* [`serde`](https://docs.rs/serde/), together with
+  [`serde_yaml`](https://docs.rs/serde_yaml/) and
+  [`serde_json`](https://docs.rs/serde_json/). Because we're using Rust, after
+  all.
+* [`git2`](https://docs.rs/git2/), a safe wrapper around `libgit2`, for all git operations.
+* [`clap`](https://docs.rs/clap/), [`console`](https://docs.rs/console/), [`comfy_table`](https://docs.rs/comfy-table/) and [`shellexpand`](https://docs.rs/shellexpand) for good UX.
+* [`isahc`](https://docs.rs/isahc/) as the HTTP client for forge integrations.

 # Links

 * [crates.io](https://crates.io/crates/git-repo-manager)
+
+# Mirrors
+
+This repository can be found on multiple forges:
+
+* https://github.com/hakoerber/git-repo-manager
+* https://code.hkoerber.de/hannes/git-repo-manager/
+* https://codeberg.org/hakoerber/git-repo-manager
+* https://git.sr.ht/~hkoerber/git-repo-manager
--- a/docs/book.toml
+++ b/docs/book.toml
@@ -7,3 +7,8 @@ title = "Git Repo Manager"

 [output.html]
 mathjax-support = true
+
+# [output.linkcheck]
+# follow-web-links = true
+# traverse-parent-directories = false
+# warning-policy = "error"
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -1,9 +1,20 @@
 # Summary

- [Overview](./overview.md)
+[Overview](./overview.md)
+
 - [Installation](./installation.md)
- [Repository trees](./repos.md)
+- [Tutorial](./tutorial.md)
+- [Managing Repositories](./repos.md)
+  - [Local Configuration](./local_configuration.md)
+  - [Forge Integrations](./forge_integration.md)
 - [Git Worktrees](./worktrees.md)
- [Forge Integrations](./forge_integration.md)
+  - [Working with Worktrees](./worktree_working.md)
+  - [Worktrees and Remotes](./worktree_remotes.md)
+  - [Behavior Details](./worktree_behavior.md)
 - [FAQ](./faq.md)
- [Contributing](./contributing.md)
+- [Developer Documentation](./developing.md)
+  - [Testing](./testing.md)
+  - [Dependency updates](./dependency_updates.md)
+  - [Releases](./releases.md)
+  - [Formatting & Style](./formatting_and_style.md)
+  - [The Docs Themselves](./documentation.md)
--- a/docs/src/contributing.md
+++ b/docs/src/contributing.md
@@ -1 +0,0 @@
-../../CONTRIBUTING.md
--- a/docs/src/dependency_updates.md
+++ b/docs/src/dependency_updates.md
@@ -0,0 +1,10 @@
+# Dependency updates
+
+Rust has the same problem as the node ecosystem, just a few magnitudes smaller:
+Dependency sprawl. GRM has a dozen direct dependencies, but over 150 transitive
+ones.
+
+To keep them up to date, there is a script:
+`depcheck/update-cargo-dependencies.py`. It updates direct dependencies to the
+latest stable version and updates transitive dependencies where possible. To run
+it, use `just update-dependencies`, which will create commits for each update.
--- a/docs/src/developing.md
+++ b/docs/src/developing.md
@@ -0,0 +1,69 @@
+# Overview
+
+GRM is still in very early development. I started GRM mainly to scratch my own
+itches (and am heavily dogfooding it). If you have a new use case for GRM, go
+for it!
+
+## Contributing
+
+To contribute, just fork the repo and create a pull request against `develop`.
+If you plan bigger changes, please consider opening an issue first, so we can
+discuss it.
+
+If you want, add yourself to the `CONTRIBUTORS` file in your pull request.
+
+## Branching strategy
+
+The branching strategy is a simplified
+[git-flow](https://nvie.com/posts/a-successful-git-branching-model/).
+
+* `master` is the "production" branch. Each commit is a new release.
+* `develop` is the branch where new stuff is coming in.
+* feature branches branch off of `develop` and merge back into it.
+
+Feature branches are not required, there are also changes happening directly on
+`develop`.
+
+## Required tooling
+
+You will need the following tools:
+
+* Rust (obviously) (easiest via `rustup`), with the nightly toolchain
+* Python3
+* [`just`](https://github.com/casey/just), a command runner like `make`. See
+  [here](https://github.com/casey/just#installation) for installation
+  instructions (it's most likely just a simple `cargo install just`).
+* Docker & docker-compose for the e2e tests
+* `black` and `shfmt` for formatting.
+* `shellcheck` for shell script linting
+* `mdbook` for the documentation
+
+Here are the tools:
+
+| Distribution  | Command                                                                                             |
+| ------------- | --------------------------------------------------------------------------------------------------- |
+| Arch Linux    | `pacman -S --needed python3 rustup just docker docker-compose python-black shfmt shellcheck mdbook` |
+| Ubuntu/Debian | `apt-get install --no-install-recommends python3 docker.io docker-compose black shellcheck`         |
+
+Note that you will have to install `just` and `mdbook` manually on Ubuntu (e.g.
+via `cargo install just mdbook` if your rust build environment is set up
+correctly). Same for `shfmt`, which may just be a `go install
+mvdan.cc/sh/v3/cmd/shfmt@latest`, depending on your go build environment.
+
+For details about rustup and the toolchains, see [the installation
+section](./installation.md).
+
+## FAQ
+
+### Why nightly?
+
+For now, GRM requires the nightly toolchain for two reasons:
+
+* [`io_error_more`](https://github.com/rust-lang/rust/issues/86442) to get
+  better error messages on IO errors
+* [`const_option_ext`](https://github.com/rust-lang/rust/issues/91930) to have
+  static variables read from the environment that fall back to hard coded
+  defaults
+
+Honestly, both of those are not really necessary or can be handled without
+nightly. It's just that I'm using nightly anyway.
--- a/docs/src/documentation.md
+++ b/docs/src/documentation.md
@@ -0,0 +1,11 @@
+# Documentation
+
+The documentation lives in the `docs` folder and uses
+[mdBook](https://github.com/rust-lang/mdBook). Please document new user-facing
+features here!
+
+Using [GitHub actions](https://github.com/features/actions), the documentation
+on `master` is automatically published to [the project
+homepage](https://hakoerber.github.io/git-repo-manager/) via GitHub pages. See
+`.github/workflows/gh-pages.yml` for the configuration of GitHub Actions.
+
--- a/docs/src/faq.md
+++ b/docs/src/faq.md
@@ -1,10 +1,3 @@
 # FAQ

-## Why is the nightly toolchain required?
-
-Building GRM currently requires nightly features due to the usage of
-[`std::path::Path::is_symlink()`](https://doc.rust-lang.org/std/fs/struct.FileType.html#method.is_symlink).
-See the [tracking issue](https://github.com/rust-lang/rust/issues/85748).
-
-`is_symlink()` is actually available in rustc 1.57, so it will be on stable in
-the near future. This would mean that GRM can be built using the stable toolchain!
+Currently empty, as there are no questions that are asked frequently :D
--- a/docs/src/forge_integration.md
+++ b/docs/src/forge_integration.md
@@ -1,19 +1,20 @@
 # Forge Integrations

-In addition to manging repositories locally, `grm` also integrates with source
+In addition to managing repositories locally, `grm` also integrates with source
 code hosting platforms. Right now, the following platforms are supported:

 * [GitHub](https://github.com/)
 * [GitLab](https://gitlab.com/)

-Imagine you are just starting out with `grm` and want to clone all your repositories
-from GitHub. This is as simple as:
+Imagine you are just starting out with `grm` and want to clone all your
+repositories from GitHub. This is as simple as:

 ```bash
 $ grm repos sync remote --provider github --owner --token-command "pass show github_grm_access_token" --path ~/projects
 ```

-You will end up with your projects cloned into `~/projects/{your_github_username}/`
+You will end up with your projects cloned into
+`~/projects/{your_github_username}/`

 ## Authentication

@@ -34,8 +35,8 @@ See the GitLab documentation for personal access tokens:

 The required scopes are a bit weird. Actually, the following should suffice:

-* * `read_user` to get user information (required to get the current authenticated
-  user name for the `--owner` filter.
+* `read_user` to get user information (required to get the current
+  authenticated user name for the `--owner` filter.
 * A scope that allows reading private repositories. (`read_repository` is just
  for *cloning* private repos). This unfortunately does not exist.

@@ -106,7 +107,7 @@ The options in the file map to the command line options of the `grm repos sync
 remote` command.

 You'd then run the `grm repos sync` command the same way as with a list of
-repositories in a config:
+repositories in a configuration:

 ```bash
 $ grm repos sync --config example.config.toml
@@ -120,11 +121,11 @@ $ grm repos find config --config example.config.toml > repos.toml
 $ grm repos sync config --config repos.toml
 ```

-## Using with selfhosted GitLab
+## Using with self-hosted GitLab

 By default, `grm` uses the default GitLab API endpoint
-([https://gitlab.com](https://gitlab.com)). You can override the
-endpoint by specifying the `--api-url` parameter. Like this:
+([https://gitlab.com](https://gitlab.com)). You can override the endpoint by
+specifying the `--api-url` parameter. Like this:

 ```bash
 $ grm repos sync remote --provider gitlab --api-url https://gitlab.example.com [...]
@@ -138,26 +139,28 @@ can be overridden with the `--force-ssh` switch.
 ## About the token command

 To ensure maximum flexibility, `grm` has a single way to get the token it uses
-to authenticate: Specify a command that returns the token via stdout. This easily
-integrates with password managers like [`pass`](https://www.passwordstore.org/).
+to authenticate: Specify a command that returns the token via stdout. This
+easily integrates with password managers like
+[`pass`](https://www.passwordstore.org/).

 Of course, you are also free to specify something like `echo mytoken` as the
-command, as long as you are ok with the security implications (like having the
-token in cleartext in your shell history). It may be better to have the token
+command, as long as you are OK with the security implications (like having the
+token in clear text in your shell history). It may be better to have the token
 in a file instead and read it: `cat ~/.gitlab_token`.

-Generally, use whatever you want. The command just has to return sucessfully and
-return the token as the first line of stdout.
+Generally, use whatever you want. The command just has to return successfully
+and return the token as the first line of stdout.

 ## Examples

-Maybe you just want to locally clone all repos from your github user?
+Maybe you just want to locally clone all repos from your GitHub user?

 ```bash
 $ grm repos sync remote --provider github --owner --root ~/github_projects --token-command "pass show github_grm_access_token"
 ```

-This will clone all repositories into `~/github_projects/{your_github_username}`.
+This will clone all repositories into
+`~/github_projects/{your_github_username}`.

 If instead you want to clone **all** repositories you have access to (e.g. via
 organizations or other users' private repos you have access to), just change the
@@ -172,12 +175,13 @@ $ grm repos sync remote --provider github --access --root ~/github_projects --to
 ### GitHub

 Unfortunately, GitHub does not have a nice API endpoint to get **private**
-repositories for a certain user ([`/users/{user}/repos/`](https://docs.github.com/en/rest/repos/repos#list-repositories-for-a-user) only returns public
-repositories).
+repositories for a certain user
+([`/users/{user}/repos/`](https://docs.github.com/en/rest/repos/repos#list-repositories-for-a-user)
+only returns public repositories).

 Therefore, using `--user {user}` will only show public repositories for GitHub.
-Note that this does not apply to `--access`: If you have access to another user's
-private repository, it will be listed.
+Note that this does not apply to `--access`: If you have access to another
+user's private repository, it will be listed.

 ## Adding integrations

@@ -197,9 +201,9 @@ Each repo has to have the following properties:

 * A name (which also acts as the identifier for diff between local and remote
  repositories)
-* An SSH url to push to
-* An HTTPS url to clone and fetch from
+* An SSH URL to push to
+* An HTTPS URL to clone and fetch from
 * A flag that marks the repository as private

-If you plan to implement another forge, please first open an issue so we can
-go through the required setup. I'm happy to help!
+If you plan to implement another forge, please first open an issue so we can go
+through the required setup. I'm happy to help!
--- a/docs/src/formatting_and_style.md
+++ b/docs/src/formatting_and_style.md
@@ -0,0 +1,45 @@
+# Formatting & Style
+
+## Code formatting
+
+I'm allergic to discussions about formatting. I'd rather make the computer do it
+for me.
+
+For Rust, just use `cargo fmt`. For Python, use
+[black](https://github.com/psf/black). I'd rather not spend any effort in
+configuring the formatters (not possible for black anyway). For shell scripts,
+use [`shfmt`](https://github.com/mvdan/sh).
+
+To autoformat all code, use `just fmt`
+
+## Style
+
+Honestly, no idea about style. I'm still learning Rust, so I'm trying to find a
+good style. Just try to keep it consistent when you add code.
+
+## Linting
+
+You can use `just lint` to run all lints.
+
+### Rust
+
+Clippy is the guard that prevents shitty code from getting into the code base.
+When running `just check`, any clippy suggestions will make the command fail.
+So make clippy happy! The easiest way:
+
+* Commit your changes (so clippy can change safely).
+* Run `cargo clippy --fix` to do the easy changes automatically.
+* Run `cargo clippy` and take a look at the messages.
+
+Until now, I had no need to override or silence any clippy suggestions.
+
+### Shell
+
+`shellcheck` lints all shell scripts. As they change very rarely, this is not
+too important.
+
+## Unsafe code
+
+Any `unsafe` code is forbidden for now globally via `#![forbid(unsafe_code)]`.
+I cannot think of any reason GRM may need `unsafe`. If it comes up, it needs to
+be discussed.
--- a/docs/src/installation.md
+++ b/docs/src/installation.md
@@ -2,8 +2,9 @@

 ## Installation

-Building GRM currently requires the nightly Rust toolchain. The easiest way
-is using [`rustup`](https://rustup.rs/). Make sure that rustup is properly installed.
+Building GRM currently requires the nightly Rust toolchain. The easiest way is
+using [`rustup`](https://rustup.rs/). Make sure that rustup is properly
+installed.

 Make sure that the nightly toolchain is installed:

@@ -15,7 +16,7 @@ Then, install the build dependencies:

 | Distribution  | Command                                                                        |
 | ------------- | ------------------------------------------------------------------------------ |
-| Archlinux     | `pacman -S --needed gcc openssl pkg-config`                                    |
+| Arch Linux    | `pacman -S --needed gcc openssl pkg-config`                                    |
 | Ubuntu/Debian | `apt-get install --no-install-recommends pkg-config gcc libssl-dev zlib1g-dev` |

 Then, it's a simple command to install the latest stable version:
@@ -33,12 +34,12 @@ $ cargo +nightly install --git https://github.com/hakoerber/git-repo-manager.git
 ## Static build

 Note that by default, you will get a  dynamically linked executable.
-Alternatively, you can also build a statically linked binary. For this, you
-will need `musl` and a few other build dependencies installed installed:
+Alternatively, you can also build a statically linked binary. For this, you will
+need `musl` and a few other build dependencies installed installed:

 | Distribution  | Command                                                                     |
 | ------------- | --------------------------------------------------------------------------- |
-| Archlinux     | `pacman -S --needed gcc musl perl make`                                     |
+| Arch Linux    | `pacman -S --needed gcc musl perl make`                                     |
 | Ubuntu/Debian | `apt-get install --no-install-recommends gcc musl-tools libc-dev perl make` |

 (`perl` and `make` are required for the OpenSSL build script)
--- a/docs/src/local_configuration.md
+++ b/docs/src/local_configuration.md
@@ -0,0 +1,83 @@
+# Local Configuration
+
+When managing multiple git repositories with GRM, you'll generally have a
+configuration file containing information about all the repos you have. GRM then
+makes sure that you repositories match that configuration. If they don't exist
+yet, it will clone them. It will also make sure that all remotes are configured
+properly.
+
+Let's try it out:
+
+## Get the example configuration
+
+```bash
+$ curl --proto '=https' --tlsv1.2 -sSfO https://raw.githubusercontent.com/hakoerber/git-repo-manager/master/example.config.toml
+```
+
+Then, you're ready to run the first sync. This will clone all configured
+repositories and set up the remotes.
+
+```bash
+$ grm repos sync config --config example.config.toml
+[⚙] Cloning into "/home/me/projects/git-repo-manager" from "https://code.hkoerber.de/hannes/git-repo-manager.git"
+[✔] git-repo-manager: Repository successfully cloned
+[⚙] git-repo-manager: Setting up new remote "github" to "https://github.com/hakoerber/git-repo-manager.git"
+[✔] git-repo-manager: OK
+[⚙] Cloning into "/home/me/projects/dotfiles" from "https://github.com/hakoerber/dotfiles.git"
+[✔] dotfiles: Repository successfully cloned
+[✔] dotfiles: OK
+```
+
+If you run it again, it will report no changes:
+
+```
+$ grm repos sync config -c example.config.toml
+[✔] git-repo-manager: OK
+[✔] dotfiles: OK
+```
+
+### Generate your own configuration
+
+Now, if you already have a few repositories, it would be quite laborious to
+write a configuration from scratch. Luckily, GRM has a way to generate a
+configuration from an existing file tree:
+
+```bash
+$ grm repos find local ~/your/project/root > config.toml
+```
+
+This will detect all repositories and remotes and write them to `config.toml`.
+
+### Show the state of your projects
+
+```bash
+$ grm repos status --config example.config.toml
+╭──────────────────┬──────────┬────────┬───────────────────┬────────┬─────────╮
+│ Repo             ┆ Worktree ┆ Status ┆ Branches          ┆ HEAD   ┆ Remotes │
+╞══════════════════╪══════════╪════════╪═══════════════════╪════════╪═════════╡
+│ git-repo-manager ┆          ┆ ✔      ┆ branch: master    ┆ master ┆ github  │
+│                  ┆          ┆        ┆ <origin/master> ✔ ┆        ┆ origin  │
+├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌┤
+│ dotfiles         ┆          ┆ ✔      ┆                   ┆ Empty  ┆ origin  │
+╰──────────────────┴──────────┴────────┴───────────────────┴────────┴─────────╯
+```
+
+You can also use `status` without `--config` to check the repository you're
+currently in:
+
+```
+$ cd ~/example-projects/dotfiles
+$ grm repos status
+╭──────────┬──────────┬────────┬──────────┬───────┬─────────╮
+│ Repo     ┆ Worktree ┆ Status ┆ Branches ┆ HEAD  ┆ Remotes │
+╞══════════╪══════════╪════════╪══════════╪═══════╪═════════╡
+│ dotfiles ┆          ┆ ✔      ┆          ┆ Empty ┆ origin  │
+╰──────────┴──────────┴────────┴──────────┴───────┴─────────╯
+```
+
+## YAML
+
+By default, the repo configuration uses TOML. If you prefer YAML, just give it a
+YAML file instead (file ending does not matter, `grm` will figure out the
+format).  For generating a configuration, pass `--format yaml` to `grm repo
+find` which generates a YAML configuration instead of a TOML configuration.
--- a/docs/src/overview.md
+++ b/docs/src/overview.md
@@ -1,8 +1,8 @@
 # Overview

 Welcome! This is the documentation for [Git Repo
-Manager](https://github.com/hakoerber/git-repo-manager/) (GRM for short), a
-tool that helps you manage git repositories.
+Manager](https://github.com/hakoerber/git-repo-manager/) (GRM for short), a tool
+that helps you manage git repositories in a declarative way.

 GRM helps you manage git repositories in a declarative way. Configure your
 repositories in a TOML or YAML file, GRM does the rest. Take a look at [the
@@ -12,12 +12,12 @@ to get a feel for the way you configure your repositories. See the [repository
 tree chapter](./repos.md) for details.

 GRM also provides some tooling to work with single git repositories using
-`git-worktree`. See [the worktree chapter](./worktree.md) for more details.
+`git-worktree`. See [the worktree chapter](./worktrees.md) for more details.

 ## Why use GRM?

-If you're working with a lot of git repositories, GRM can help you to manage them
-in an easy way:
+If you're working with a lot of git repositories, GRM can help you to manage
+them in an easy way:

 * You want to easily clone many repositories to a new machine.
 * You want to change remotes for multiple repositories (e.g. because your GitLab
--- a/docs/src/releases.md
+++ b/docs/src/releases.md
@@ -0,0 +1,27 @@
+# Releases
+
+To make a release, make sure you are on a clean `develop` branch, sync your
+remotes and then run `./release (major|minor|patch)`. It will handle a
+git-flow-y release, meaning that it will perform a merge from `develop` to
+`master`, create a git tag, sync all remotes and run `cargo publish`.
+
+Make sure to run `just check` before releasing to make sure that nothing is
+broken.
+
+As GRM is still `v0.x`, there is not much consideration for backwards
+compatibility. Generally, update the patch version for small stuff and the minor
+version for bigger / backwards incompatible changes.
+
+Generally, it's good to regularly release a new patch release with [updated
+dependencies](./dependency_updates.md). As `./release.sh patch` is exposed as a
+Justfile target (`release-patch`), it's possible to do both in one step:
+
+```bash
+$ just update-dependencies check release-patch
+```
+
+## Release notes
+
+There are currently no release notes. Things are changing quite quickly and
+there is simply no need for a record of changes (except the git history of
+course).
--- a/docs/src/repos.md
+++ b/docs/src/repos.md
@@ -1,82 +1,13 @@
-# Managing tree of git repositories
+# Managing Repositories

-When managing multiple git repositories with GRM, you'll generally have a
-configuration file containing information about all the repos you have. GRM then
-makes sure that you repositories match that config. If they don't exist yet, it
-will clone them. It will also make sure that all remotes are configured properly.
+GRM helps you manage a bunch of git repositories easily. There are generally two
+ways to go about that:

-Let's try it out:
+You can either manage a list of repositories in a TOML or YAML file, and use GRM
+to sync the configuration with the state of the repository.

-## Get the example configuration
+Or, you can pull repository information from a forge (e.g. GitHub, GitLab) and
+clone the repositories.

-```bash
-$ curl --proto '=https' --tlsv1.2 -sSfO https://raw.githubusercontent.com/hakoerber/git-repo-manager/master/example.config.toml
-```
-
-Then, you're ready to run the first sync. This will clone all configured repositories
-and set up the remotes.
-
-```bash
-$ grm repos sync config --config example.config.toml
-[⚙] Cloning into "/home/me/projects/git-repo-manager" from "https://code.hkoerber.de/hannes/git-repo-manager.git"
-[✔] git-repo-manager: Repository successfully cloned
-[⚙] git-repo-manager: Setting up new remote "github" to "https://github.com/hakoerber/git-repo-manager.git"
-[✔] git-repo-manager: OK
-[⚙] Cloning into "/home/me/projects/dotfiles" from "https://github.com/hakoerber/dotfiles.git"
-[✔] dotfiles: Repository successfully cloned
-[✔] dotfiles: OK
-```
-
-If you run it again, it will report no changes:
-
-```
-$ grm repos sync config -c example.config.toml
-[✔] git-repo-manager: OK
-[✔] dotfiles: OK
-```
-
-### Generate your own configuration
-
-Now, if you already have a few repositories, it would be quite laborious to write
-a configuration from scratch. Luckily, GRM has a way to generate a configuration
-from an existing file tree:
-
-```bash
-$ grm repos find local ~/your/project/root > config.toml
-```
-
-This will detect all repositories and remotes and write them to `config.toml`.
-
-### Show the state of your projects
-
-```bash
-$ grm repos status --config example.config.toml
-╭──────────────────┬──────────┬────────┬───────────────────┬────────┬─────────╮
-│ Repo             ┆ Worktree ┆ Status ┆ Branches          ┆ HEAD   ┆ Remotes │
-╞══════════════════╪══════════╪════════╪═══════════════════╪════════╪═════════╡
-│ git-repo-manager ┆          ┆ ✔      ┆ branch: master    ┆ master ┆ github  │
-│                  ┆          ┆        ┆ <origin/master> ✔ ┆        ┆ origin  │
-├╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌┼╌╌╌╌╌╌╌╌╌┤
-│ dotfiles         ┆          ┆ ✔      ┆                   ┆ Empty  ┆ origin  │
-╰──────────────────┴──────────┴────────┴───────────────────┴────────┴─────────╯
-```
-
-You can also use `status` without `--config` to check the repository you're currently
-in:
-
-```
-$ cd ~/example-projects/dotfiles
-$ grm repos status
-╭──────────┬──────────┬────────┬──────────┬───────┬─────────╮
-│ Repo     ┆ Worktree ┆ Status ┆ Branches ┆ HEAD  ┆ Remotes │
-╞══════════╪══════════╪════════╪══════════╪═══════╪═════════╡
-│ dotfiles ┆          ┆ ✔      ┆          ┆ Empty ┆ origin  │
-╰──────────┴──────────┴────────┴──────────┴───────┴─────────╯
-```
-
-## YAML
-
-By default, the repo configuration uses TOML. If you prefer YAML, just give it
-a YAML file instead (file ending does not matter, `grm` will figure out the format).
-For generating a configuration, pass `--format yaml` to `grm repo find`
-which generates a YAML config instead of a TOML configuration.
+There are also hybrid modes where you pull information from a forge and create a
+configuration file that you can use later.
--- a/docs/src/testing.md
+++ b/docs/src/testing.md
@@ -0,0 +1,124 @@
+# Testing
+
+There are two distinct test suites: One for unit test (`just test-unit`) and
+integration tests (`just test-integration`) that is part of the rust crate, and
+a separate e2e test suite in python (`just test-e2e`).
+
+To run all tests, run `just test`.
+
+When contributing, consider whether it makes sense to add tests which could
+prevent regressions in the future. When fixing bugs, it makes sense to add tests
+that expose the wrong behavior beforehand.
+
+The unit and integration tests are very small and only test a few self-contained
+functions (like validation of certain input).
+
+## E2E tests
+
+The main focus of the testing setup lays on the e2e tests. Each user-facing
+behavior *should* have a corresponding e2e test. These are the most important
+tests, as they test functionality the user will use in the end.
+
+The test suite is written in python and uses
+[pytest](https://docs.pytest.org/en/stable/). There are helper functions that
+set up temporary git repositories and remotes in a `tmpfs`.
+
+Effectively, each tests works like this:
+
+* Set up some prerequisites (e.g. different git repositories or configuration
+  files)
+* Run `grm`
+* Check that everything is according to expected behavior (e.g. that `grm` had
+  certain output and exit code, that the target repositories have certain
+  branches, heads and remotes, ...)
+
+As there are many different scenarios, the tests make heavy use of the
+[`@pytest.mark.parametrize`](https://docs.pytest.org/en/stable/how-to/parametrize.html#pytest-mark-parametrize)
+decorator to get all permutations of input parameters (e.g. whether a
+configuration exists, what a config value is set to, how the repository looks
+like, ...)
+
+Whenever you write a new test, think about the different circumstances that can
+happen. What are the failure modes? What affects the behavior? Parametrize each
+of these behaviors.
+
+### Optimization
+
+Note: You will most likely not need to read this.
+
+Each test parameter will exponentially increase the number of tests that will be
+run. As a general rule, comprehensiveness is more important than test suite
+runtime (so if in doubt, better to add another parameter to catch every edge
+case). But try to keep the total runtime sane. Currently, the whole `just e2e`
+target runs ~8'000 tests and takes around 5 minutes on my machine, exlucding
+binary and docker build time. I'd say that keeping it under 10 minutes is a good
+idea.
+
+To optimize tests, look out for two patterns: Dependency and Orthogonality
+
+#### Dependency
+
+If a parameter depends on another one, it makes little sense to handle them
+independently. Example: You have a paramter that specifies whether a
+configuration is used, and another parameter that sets a certain value in that
+configuration file. It might look something like this:
+
+```python
+@pytest.mark.parametrize("use_config", [True, False])
+@pytest.mark.parametrize("use_value", ["0", "1"])
+def test(...):
+```
+
+This leads to 4 tests being instantiated. But there is little point in setting a
+configuration value when no config is used, so the combinations `(False, "0")`
+and `(False, "1")` are redundant. To remedy this, spell out the optimized
+permutation manually:
+
+```python
+@pytest.mark.parametrize("config", ((True, "0"), (True, "1"), (False, None)))
+def test(...):
+    (use_config, use_value) = config
+```
+
+This cuts down the number of tests by 25%. If you have more dependent parameters
+(e.g. additional configuration values), this gets even better.  Generally, this
+will cut down the number of tests to
+
+\\[ \frac{1}{o \cdot c} + \frac{1}{(o \cdot c) ^ {(n + 1)}} \\]
+
+with \\( o \\) being the number of values of a parent parameters a parameter is
+dependent on, \\( c \\) being the cardinality of the test input (so you can
+assume \\( o = 1 \\) and \\( c = 2 \\) for boolean parameters), and \\( n \\)
+being the number of parameters that are optimized, i.e. folded into their
+dependent parameter.
+
+As an example: Folding down two boolean parameters into one dependent parent
+boolean parameter will cut down the number of tests to 62.5%!
+
+#### Orthogonality
+
+If different test parameters are independent of each other, there is little
+point in testing their combinations. Instead, split them up into different test
+functions. For boolean parameters, this will cut the number of tests in half.
+
+So instead of this:
+
+```python
+@pytest.mark.parametrize("param1", [True, False])
+@pytest.mark.parametrize("param2", [True, False])
+def test(...):
+```
+
+Rather do this:
+
+```python
+@pytest.mark.parametrize("param1", [True, False])
+def test_param1(...):
+
+@pytest.mark.parametrize("param2", [True, False])
+def test_param2(...):
+```
+
+The tests are running in Docker via docker-compose. This is mainly needed to
+test networking functionality like GitLab integration, with the GitLab API being
+mocked by a simple flask container.
--- a/docs/src/tutorial.md
+++ b/docs/src/tutorial.md
@@ -0,0 +1,183 @@
+# Tutorial
+
+Here, you'll find a quick overview over the most common functionality of GRM.
+
+## Managing existing repositories
+
+Let's say you have your git repositories at `~/code`. To start managing them via
+GRM, first create a configuration:
+
+```bash
+grm repos find local ~/code --format yaml > ~/code/config.yml
+```
+
+The result may look something like this:
+
+```yaml
+---
+trees:
+  - root: ~/code
+    repos:
+      - name: git-repo-manager
+        worktree_setup: true
+        remotes:
+          - name: origin
+            url: "https://github.com/hakoerber/git-repo-manager.git"
+            type: https
+```
+
+To apply the configuration and check whether all repositories are in sync, run
+the following:
+
+```bash
+$ grm repos sync config --config ~/code/config.yml
+[✔] git-repo-manager: OK
+```
+
+Well, obiously there are no changes. To check how changes would be applied,
+let's change the name of the remote (currently `origin`):
+
+```bash
+$ sed -i 's/name: origin/name: github/' ~/code/config.yml
+$ grm repos sync config --config ~/code/config.yml
+[⚙] git-repo-manager: Setting up new remote "github" to "https://github.com/hakoerber/git-repo-manager.git"
+[⚙] git-repo-manager: Deleting remote "origin"
+[✔] git-repo-manager: OK
+```
+
+GRM replaced the `origin` remote with `github`.
+
+The configuration (`~/code/config.yml` in this example) would usually be
+something you'd track in git or synchronize between machines via some other
+means. Then, on every machine, all your repositories are a single `grm repos
+sync` away!
+
+## Getting repositories from a forge
+
+Let's say you have a bunch of repositories on GitHub and you'd like to clone
+them all to your local machine.
+
+To authenticate, you'll need to get a personal access token, as described in
+[the forge documentation](./forge_integration.md#github). Let's assume you put
+your token into `~/.github_token` (please don't if you're doing this "for
+real"!)
+
+Let's first see what kind of repos we can find:
+
+```bash
+$ grm repos sync remote --provider github --token-command "cat ~/.github_token" --root ~/code/github.com/ --format yaml
+---
+trees: []
+$
+```
+
+Ummm, ok? No repos? This is because you have to *tell* GRM what to look for (if
+you don't, GRM will just relax, as it's lazy).
+
+There are different filters (see [the forge
+documentation](./forge_integration.md#filters) for more info). In our case,
+we'll just use the `--owner` filter to get all repos that belong to us:
+
+```bash
+$ grm repos find remote --provider github --token-command "cat ~/.github_token" --root ~/code/github.com/ --format yaml
+---
+trees:
+  - root: ~/code/github.com
+    repos:
+      - name: git-repo-manager
+        worktree_setup: false
+        remotes:
+          - name: origin
+            url: "https://github.com/hakoerber/git-repo-manager.git"
+            type: https
+```
+
+Nice! The format is the same as we got from `grm repos find local` above. So if
+we wanted, we could save this file and use it with `grm repos sync config` as
+above. But there is an even easier way: We can directly clone the repositories!
+
+```bash
+$ grm repos sync remote --provider github --token-command "cat ~/.github_token" --root ~/code/github.com/
+[⚙] Cloning into "~/code/github.com/git-repo-manager" from "https://github.com/hakoerber/git-repo-manager.git"
+[✔] git-repo-manager: Repository successfully cloned
+[✔] git-repo-manager: OK
+```
+
+Nice! Just to make sure, let's run the same command again:
+
+```bash
+$ grm repos sync remote --provider github --token-command "cat ~/.github_token" --root ~/code/github.com/
+[✔] git-repo-manager: OK
+```
+
+GRM saw that the repository is already there and did nothing (remember, it's
+lazy).
+
+## Using worktrees
+
+Worktrees are something that make it easier to work with multiple branches at
+the same time in a repository.  Let's say we wanted to hack on the codebase of
+GRM:
+
+```bash
+$ cd ~/code/github.com/git-repo-manager
+$ ls
+.gitignore
+Cargo.toml
+...
+```
+
+Well, this is just a normal git repository. But let's try worktrees! First, we
+have to convert the existing repository to use the special worktree setup. For
+all worktree operations, we will use `grm worktree` (or `grm wt` for short):
+
+```bash
+$ grm wt convert
+[✔] Conversion done
+$ ls
+$
+```
+
+So, the code is gone? Not really, there is just no active worktree right now. So
+let's add one for `master`:
+
+
+```bash
+$ grm wt add master --track origin/master
+[✔] Conversion done
+$ ls
+master
+$ (cd ./master && git status)
+On branch master
+nothing to commit, working tree clean
+```
+
+Now, a single worktree is kind of pointless (if we only have one, we could also
+just use the normal setup, without worktrees). So let's another one for
+`develop`:
+
+```bash
+$ grm wt add develop --track origin/develop
+[✔] Conversion done
+$ ls
+develop
+master
+$ (cd ./develop && git status)
+On branch develop
+nothing to commit, working tree clean
+```
+
+What's the point? The cool thing is that we can now start working in the
+`develop` worktree, without affecting the `master` worktree at all. If you're
+working on `develop` and want to quickly see what a certain file looks like in
+`master`, just look inside `./master`, it's all there!
+
+This becomes especially interesting when you have many feature branches and are
+working on multiple features at the same time.
+
+There are a lot of options that influence how worktrees are handled. Maybe you
+want to automatically track `origin/master` when you add a worktree called
+`master`?  Maybe you want your feature branches to have a prefix, so when you're
+working on the `feature1` worktree, the remote branch will be
+`origin/awesomefeatures/feature1`? Check out [the chapter on
+worktrees](./worktrees.md) for all the things that are possible.
--- a/docs/src/worktree_behavior.md
+++ b/docs/src/worktree_behavior.md
@@ -0,0 +1,32 @@
+# Behavior Details
+
+When working with worktrees and GRM, there is a lot going on under the hood.
+Each time you create a new worktree, GRM has to figure out what commit to set
+your new branch to and how to configure any potential remote branches.
+
+To state again, the most important guideline is the following:
+
+**The branch inside the worktree is always the same as the directory name of the
+worktree.**
+
+The second set of guidelines relates to the commit to check out, and the remote
+branches to use:
+
+* When a branch already exists, you will get a worktree for that branch
+* Existing local branches are never changed
+* Only do remote operations if specifically requested (via configuration file or
+  command line parameters)
+* When you specify `--track`, you will get that exact branch as the tracking
+  branch
+* When you specify `--no-track`, you will get no tracking branch
+
+Apart from that, GRM tries to do The Right Thing<sup>TM</sup>. It should be as
+little surprising as possible.
+
+In 99% of the cases, you will not have to care about the details, as the normal
+workflows are covered by the rules above. In case you want to know the exact
+behavior "specification", take a look at the [module documentation for
+`grm::worktree`](https://docs.rs/git-repo-manager/latest/grm/worktree/index.html).
+
+If you think existing behavior is super-duper confusing and you have a better
+idea, do not hesitate to open a GitHub issue to discuss this!
--- a/docs/src/worktree_remotes.md
+++ b/docs/src/worktree_remotes.md
@@ -0,0 +1,75 @@
+# Worktrees and Remotes
+
+To fetch all remote references from all remotes in a worktree setup, you can use
+the following command:
+
+```
+$ grm wt fetch
+[✔] Fetched from all remotes
+```
+
+This is equivalent to running `git fetch --all` in any of the worktrees.
+
+Often, you may want to pull all remote changes into your worktrees. For this,
+use the `git pull` equivalent:
+
+```
+$ grm wt pull
+[✔] master: Done
+[✔] my-cool-branch: Done
+```
+
+This will refuse when there are local changes, or if the branch cannot be fast
+forwarded. If you want to rebase your local branches, use the `--rebase` switch:
+
+```
+$ grm wt pull --rebase
+[✔] master: Done
+[✔] my-cool-branch: Done
+```
+
+As noted, this will fail if there are any local changes in your worktree. If you
+want to stash these changes automatically before the pull (and unstash them
+afterwards), use the `--stash` option.
+
+This will rebase your changes onto the upstream branch. This is mainly helpful
+for persistent branches that change on the remote side.
+
+There is a similar rebase feature that rebases onto the **default** branch
+instead:
+
+```
+$ grm wt rebase
+[✔] master: Done
+[✔] my-cool-branch: Done
+```
+
+This is super helpful for feature branches. If you want to incorporate changes
+made on the remote branches, use `grm wt rebase` and all your branches will be
+up to date. If you want to also update to remote tracking branches in one go,
+use the `--pull` flag, and `--rebase` if you want to rebase instead of aborting
+on non-fast-forwards:
+
+```
+$ grm wt rebase --pull --rebase
+[✔] master: Done
+[✔] my-cool-branch: Done
+```
+
+"So, what's the difference between `pull --rebase` and `rebase --pull`? Why the
+hell is there a `--rebase` flag in the `rebase` command?"
+
+Yes, it's kind of weird. Remember that `pull` only ever updates each worktree to
+their remote branch, if possible. `rebase` rebases onto the **default** branch
+instead. The switches to `rebase` are just convenience, so you do not have to
+run two commands.
+
+* `rebase --pull` is the same as `pull` && `rebase`
+* `rebase --pull --rebase` is the same as `pull --rebase` && `rebase`
+
+I understand that the UX is not the most intuitive. If you can think of an
+improvement, please let me know (e.g. via an GitHub issue)!
+
+As with `pull`, `rebase` will also refuse to run when there are changes in your
+worktree. And you can also use the `--stash` option to stash/unstash changes
+automatically.
--- a/docs/src/worktree_working.md
+++ b/docs/src/worktree_working.md
@@ -0,0 +1,173 @@
+# Working with Worktrees
+
+## Creating a new worktree
+
+To actually work, you'll first have to create a new worktree checkout. All
+worktree-related commands are available as subcommands of `grm worktree` (or
+`grm wt` for short):
+
+```
+$ grm wt add mybranch
+[✔] Worktree mybranch created
+```
+
+You'll see that there is now a directory called `mybranch` that contains a
+checkout of your repository, using the branch `mybranch`
+
+```bash
+$ cd ./mybranch && git status
+On branch mybranch
+nothing to commit, working tree clean
+```
+
+You can work in this repository as usual. Make changes, commit them, revert
+them, whatever you're up to :)
+
+Just note that you *should* not change the branch inside the worktree directory.
+There is nothing preventing you from doing so, but you will notice that you'll
+run into problems when trying to remove a worktree (more on that later). It may
+also lead to confusing behavior, as there can be no two worktrees that have the
+same branch checked out. So if you decide to use the worktree setup, go all in,
+let `grm` manage your branches and bury `git branch` (and `git checkout -b`).
+
+You will notice that there is no tracking branch set up for the new branch. You
+can of course set up one manually after creating the worktree, but there is an
+easier way, using the `--track` flag during creation. Let's create another
+worktree. Go back to the root of the repository, and run:
+
+```bash
+$ grm wt add mybranch2 --track origin/mybranch2
+[✔] Worktree mybranch2 created
+```
+
+You'll see that this branch is now tracking `mybranch` on the `origin` remote:
+
+```bash
+$ cd ./mybranch2 && git status
+On branch mybranch
+
+Your branch is up to date with 'origin/mybranch2'.
+nothing to commit, working tree clean
+```
+
+The behavior of `--track` differs depending on the existence of the remote
+branch:
+
+* If the remote branch already exists, `grm` uses it as the base of the new
+  local branch.
+* If the remote branch does not exist (as in our example), `grm` will create a
+  new remote tracking branch, using the default branch (either `main` or
+  `master`) as the base
+
+Often, you'll have a workflow that uses tracking branches by default. It would
+be quite tedious to add `--track` every single time. Luckily, the `grm.toml`
+file supports defaults for the tracking behavior. See this for an example:
+
+```toml
+[track]
+default = true
+default_remote = "origin"
+```
+
+This will set up a tracking branch on `origin` that has the same name as the
+local branch.
+
+Sometimes, you might want to have a certain prefix for all your tracking
+branches.  Maybe to prevent collisions with other contributors. You can simply
+set `default_remote_prefix` in `grm.toml`:
+
+```toml
+[track]
+default = true
+default_remote = "origin"
+default_remote_prefix = "myname"
+```
+
+When using branch `my-feature-branch`, the remote tracking branch would be
+`origin/myname/my-feature-branch` in this case.
+
+Note that `--track` overrides any configuration in `grm.toml`. If you want to
+disable tracking, use `--no-track`.
+
+## Showing the status of your worktrees
+
+There is a handy little command that will show your an overview over all
+worktrees in a repository, including their status (i.e. changes files). Just run
+the following in the root of your repository:
+
+```
+$ grm wt status
+╭───────────┬────────┬──────────┬──────────────────╮
+│ Worktree  ┆ Status ┆ Branch   ┆ Remote branch    │
+╞═══════════╪════════╪══════════╪══════════════════╡
+│ mybranch  ┆ ✔      ┆ mybranch ┆                  │
+│ mybranch2 ┆ ✔      ┆ mybranch ┆ origin/mybranch2 │
+╰───────────┴────────┴──────────┴──────────────────╯
+```
+
+The "Status" column would show any uncommitted changes (new / modified / deleted
+files) and the "Remote branch" would show differences to the remote branch (e.g.
+if there are new pushes to the remote branch that are not yet incorporated into
+your local branch).
+
+
+## Deleting worktrees
+
+If you're done with your worktrees, use `grm wt delete` to delete them. Let's
+start with `mybranch2`:
+
+```
+$ grm wt delete mybranch2
+[✔] Worktree mybranch2 deleted
+```
+
+Easy. On to `mybranch`:
+
+```
+$ grm wt delete mybranch
+[!] Changes in worktree: No remote tracking branch for branch mybranch found. Refusing to delete
+```
+
+Hmmm. `grm` tells you:
+
+"Hey, there is no remote branch that you could have pushed your changes to. I'd
+rather not delete work that you cannot recover."
+
+Note that `grm` is very cautious here. As your repository will not be deleted,
+you could still recover the commits via
+[`git-reflog`](https://git-scm.com/docs/git-reflog).  But better safe than
+sorry! Note that you'd get a similar error message if your worktree had any
+uncommitted files, for the same reason. Now you can either commit & push your
+changes, or your tell `grm` that you know what you're doing:
+
+```
+$ grm wt delete mybranch --force
+[✔] Worktree mybranch deleted
+```
+
+If you just want to delete all worktrees that do not contain any changes, you
+can also use the following:
+
+```
+$ grm wt clean
+```
+
+Note that this will not delete the default branch of the repository. It can of
+course still be delete with `grm wt delete` if necessary.
+
+### Converting an existing repository
+
+It is possible to convert an existing directory to a worktree setup, using `grm
+wt convert`. This command has to be run in the root of the repository you want
+to convert:
+
+```
+$ grm wt convert
+[✔] Conversion successful
+```
+
+This command will refuse to run if you have any changes in your repository.
+Commit them and try again!
+
+Afterwards, the directory is empty, as there are no worktrees checked out yet.
+Now you can use the usual commands to set up worktrees.
--- a/docs/src/worktrees.md
+++ b/docs/src/worktrees.md
@@ -1,58 +1,60 @@
 # Git Worktrees

 ## Why?
+The default workflow when using git is having your repository in a single
+directory.  Then, you can check out a certain reference (usually a branch),
+which will update the files in the directory to match the state of that
+reference. Most of the time, this is exactly what you need and works perfectly.
+But especially when you're working with branches a lot, you may notice that
+there is a lot of work required to make everything run smoothly.

-The default workflow when using git is having your repository in a single directory.
-Then, you can check out a certain reference (usually a branch), which will update
-the files in the directory to match the state of that reference. Most of the time,
-this is exactly what you need and works perfectly. But especially when you're working
-with branches a lot, you may notice that there is a lot of work required to make
-everything run smoothly.
-
-Maybe you have experienced the following: You're working on a feature branch. Then,
-for some reason, you have to change branches (maybe to investigate some issue).
-But you get the following:
+Maybe you have experienced the following: You're working on a feature branch.
+Then, for some reason, you have to change branches (maybe to investigate some
+issue).  But you get the following:

 ```
 error: Your local changes to the following files would be overwritten by checkout
 ```

-Now you can create a temporary commit or stash your changes. In any case, you have
-some mental overhead before you can work on something else. Especially with stashes,
-you'll have to remember to do a `git stash pop` before resuming your work (I
-cannot count the number of times where I "rediscovered" some code hidden in some
-old stash I forgot about.
+Now you can create a temporary commit or stash your changes. In any case, you
+have some mental overhead before you can work on something else. Especially with
+stashes, you'll have to remember to do a `git stash pop` before resuming your
+work (I cannot count the number of times where I "rediscovered" some code hidden
+in some old stash I forgot about). Also, conflicts on a `git stash pop` are just
+horrible.

-And even worse: If you're currently in the process of resolving merge conflicts or an
-interactive rebase, there is just no way to "pause" this work to check out a
-different branch.
+And even worse: If you're currently in the process of resolving merge conflicts
+or an interactive rebase, there is just no way to "pause" this work to check out
+a different branch.

-Sometimes, it's crucial to have an unchanging state of your repository until some
-long-running process finishes. I'm thinking of Ansible and Terraform runs. I'd
-rather not change to a different branch while ansible or Terraform are running as
-I have no idea how those tools would behave (and I'm not too eager to find out).
+Sometimes, it's crucial to have an unchanging state of your repository until
+some long-running process finishes. I'm thinking of Ansible and Terraform runs.
+I'd rather not change to a different branch while ansible or Terraform are
+running as I have no idea how those tools would behave (and I'm not too eager to
+find out).

 In any case, Git Worktrees are here for the rescue:

 ## What are git worktrees?

-[Git Worktrees](https://git-scm.com/docs/git-worktree) allow you to have multiple
-independent checkouts of your repository on different directories. You can have
-multiple directories that correspond to different references in your repository.
-Each worktree has it's independent working tree (duh) and index, so there is no
-way to run into conflicts. Changing to a different branch is just a `cd` away (if
-the worktree is already set up).
+[Git Worktrees](https://git-scm.com/docs/git-worktree) allow you to have
+multiple independent checkouts of your repository on different directories. You
+can have multiple directories that correspond to different references in your
+repository.  Each worktree has it's independent working tree (duh) and index, so
+there is no way to run into conflicts. Changing to a different branch is just a
+`cd` away (if the worktree is already set up).

 ## Worktrees in GRM

-GRM exposes an opinionated way to use worktrees in your repositories. Opinionated,
-because there is a single invariant that makes reasoning about your worktree
-setup quite easy:
+GRM exposes an opinionated way to use worktrees in your repositories.
+Opinionated, because there is a single invariant that makes reasoning about your
+worktree setup quite easy:

-**The branch inside the worktree is always the same as the directory name of the worktree.**
+**The branch inside the worktree is always the same as the directory name of the
+worktree.**

-In other words: If you're checking out branch `mybranch` into a new worktree, the
-worktree directory will be named `mybranch`.
+In other words: If you're checking out branch `mybranch` into a new worktree,
+the worktree directory will be named `mybranch`.

 GRM can be used with both "normal" and worktree-enabled repositories. But note
 that a single repository can be either the former or the latter. You'll have to
@@ -67,303 +69,27 @@ name = "git-repo-manager"
 worktree_setup = true
 ```

-Now, when you run a `grm sync`, you'll notice that the directory of the repository
-is empty! Well, not totally, there is a hidden directory called `.git-main-working-tree`.
-This is where the repository actually "lives" (it's a bare checkout).
+Now, when you run a `grm sync`, you'll notice that the directory of the
+repository is empty! Well, not totally, there is a hidden directory called
+`.git-main-working-tree`.  This is where the repository actually "lives" (it's a
+bare checkout).

 Note that there are few specific things you can configure for a certain
-workspace.  This is all done in an optional `grm.toml` file right in the root
-of the worktree. More on that later.
+workspace.  This is all done in an optional `grm.toml` file right in the root of
+the worktree. More on that later.

-### Creating a new worktree

-To actually work, you'll first have to create a new worktree checkout. All
-worktree-related commands are available as subcommands of `grm worktree` (or
-`grm wt` for short):
+## Manual access

-```
-$ grm wt add mybranch
-[✔] Worktree mybranch created
-```
-
-You'll see that there is now a directory called `mybranch` that contains a checkout
-of your repository, using the branch `mybranch`
-
-```bash
-$ cd ./mybranch && git status
-On branch mybranch
-nothing to commit, working tree clean
-```
-
-You can work in this repository as usual. Make changes, commit them, revert them,
-whatever you're up to :)
-
-Just note that you *should* not change the branch inside the worktree
-directory.  There is nothing preventing you from doing so, but you will notice
-that you'll run into problems when trying to remove a worktree (more on that
-later). It may also lead to confusing behaviour, as there can be no two
-worktrees that have the same branch checked out. So if you decide to use the
-worktree setup, go all in, let `grm` manage your branches and bury `git branch`
-(and `git checkout -b`).
-
-You will notice that there is no tracking branch set up for the new branch. You
-can of course set up one manually after creating the worktree, but there is an
-easier way, using the `--track` flag during creation. Let's create another
-worktree. Go back to the root of the repository, and run:
-
-```bash
-$ grm wt add mybranch2 --track origin/mybranch2
-[✔] Worktree mybranch2 created
-```
-
-You'll see that this branch is now tracking `mybranch` on the `origin` remote:
-
-```bash
-$ cd ./mybranch2 && git status
-On branch mybranch
-
-Your branch is up to date with 'origin/mybranch2'.
-nothing to commit, working tree clean
-```
-
-The behaviour of `--track` differs depending on the existence of the remote branch:
-
-* If the remote branch already exists, `grm` uses it as the base of the new
-  local branch.
-* If the remote branch does not exist (as in our example), `grm` will create a
-  new remote tracking branch, using the default branch (either `main` or `master`)
-  as the base
-
-Often, you'll have a workflow that uses tracking branches by default. It would
-be quite tedious to add `--track` every single time. Luckily, the `grm.toml` file
-supports defaults for the tracking behaviour. See this for an example:
-
-```toml
-[track]
-default = true
-default_remote = "origin"
-```
-
-This will set up a tracking branch on `origin` that has the same name as the local
-branch.
-
-Sometimes, you might want to have a certain prefix for all your tracking branches.
-Maybe to prevent collissions with other contributors. You can simply set
-`default_remote_prefix` in `grm.toml`:
-
-```toml
-[track]
-default = true
-default_remote = "origin"
-default_remote_prefix = "myname"
-```
-
-When using branch `my-feature-branch`, the remote tracking branch would be
-`origin/myname/my-feature-branch` in this case.
-
-Note that `--track` overrides any configuration in `grm.toml`. If you want to
-disable tracking, use `--no-track`.
-
-### Showing the status of your worktrees
-
-There is a handy little command that will show your an overview over all worktrees
-in a repository, including their status (i.e. changes files). Just run the following
-in the root of your repository:
-
-```
-$ grm wt status
-╭───────────┬────────┬──────────┬──────────────────╮
-│ Worktree  ┆ Status ┆ Branch   ┆ Remote branch    │
-╞═══════════╪════════╪══════════╪══════════════════╡
-│ mybranch  ┆ ✔      ┆ mybranch ┆                  │
-│ mybranch2 ┆ ✔      ┆ mybranch ┆ origin/mybranch2 │
-╰───────────┴────────┴──────────┴──────────────────╯
-```
-
-The "Status" column would show any uncommitted changes (new / modified / deleted
-files) and the "Remote branch" would show differences to the remote branch (e.g.
-if there are new pushes to the remote branch that are not yet incorporated into
-your local branch).
-
-
-### Deleting worktrees
-
-If you're done with your worktrees, use `grm wt delete` to delete them. Let's
-start with `mybranch2`:
-
-```
-$ grm wt delete mybranch2
-[✔] Worktree mybranch2 deleted
-```
-
-Easy. On to `mybranch`:
-
-```
-$ grm wt delete mybranch
-[!] Changes in worktree: No remote tracking branch for branch mybranch found. Refusing to delete
-```
-
-Hmmm. `grm` tells you:
-
-"Hey, there is no remote branch that you could have pushed
-your changes to. I'd rather not delete work that you cannot recover."
-
-Note that `grm` is very cautious here. As your repository will not be deleted,
-you could still recover the commits via [`git-reflog`](https://git-scm.com/docs/git-reflog).
-But better safe than sorry! Note that you'd get a similar error message if your
-worktree had any uncommitted files, for the same reason. Now you can either
-commit & push your changes, or your tell `grm` that you know what you're doing:
-
-```
-$ grm wt delete mybranch --force
-[✔] Worktree mybranch deleted
-```
-
-If you just want to delete all worktrees that do not contain any changes, you
-can also use the following:
-
-```
-$ grm wt clean
-```
-
-Note that this will not delete the default branch of the repository. It can of
-course still be delete with `grm wt delete` if neccessary.
-
-### Persistent branches
-
-You most likely have a few branches that are "special", that you don't want to
-clean up and that are the usual target for feature branches to merge into. GRM
-calls them "persistent branches" and treats them a bit differently:
-
-* Their worktrees will never be deleted by `grm wt clean`
-* If the branches in other worktrees are merged into them, they will be cleaned
-  up, even though they may not be in line with their upstream. Same goes for
-  `grm wt delete`, which will not require a `--force` flag. Note that of
-  course, actual changes in the worktree will still block an automatic cleanup!
-* As soon as you enable persistent branches, non-persistent branches will only
-  ever be cleaned up when merged into a persistent branch.
-
-To elaborate: This is mostly relevant for a feature-branch workflow. Whenever a
-feature branch is merged, it can usually be thrown away. As merging is usually
-done on some remote code management platform (GitHub, GitLab, ...), this means
-that you usually keep a branch around until it is merged into one of the "main"
-branches (`master`, `main`, `develop`, ...)
-
-Enable persistent branches by setting the following in the `grm.toml` in the
-worktree root:
-
-```toml
-persistent_branches = [
-    "master",
-    "develop",
-]
-```
-
-Note that setting persistent branches will disable any detection of "default"
-branches. The first entry will be considered your repositories' default branch.
-
-### Converting an existing repository
-
-It is possible to convert an existing directory to a worktree setup, using `grm
-wt convert`. This command has to be run in the root of the repository you want
-to convert:
-
-```
-$ grm wt convert
-[✔] Conversion successful
-```
-
-This command will refuse to run if you have any changes in your repository.
-Commit them and try again!
-
-Afterwards, the directory is empty, as there are no worktrees checked out yet.
-Now you can use the usual commands to set up worktrees.
-
-### Working with remotes
-
-To fetch all remote references from all remotes in a worktree setup, you can
-use the following command:
-
-```
-$ grm wt fetch
-[✔] Fetched from all remotes
-```
-
-This is equivalent to running `git fetch --all` in any of the worktrees.
-
-Often, you may want to pull all remote changes into your worktrees. For this,
-use the `git pull` equivalent:
-
-```
-$ grm wt pull
-[✔] master: Done
-[✔] my-cool-branch: Done
-```
-
-This will refuse when there are local changes, or if the branch cannot be fast
-forwarded. If you want to rebase your local branches, use the `--rebase` switch:
-
-```
-$ grm wt pull --rebase
-[✔] master: Done
-[✔] my-cool-branch: Done
-```
-
-As noted, this will fail if there are any local changes in your worktree. If you
-want to stash these changes automatically before the pull (and unstash them
-afterwards), use the `--stash` option.
-
-This will rebase your changes onto the upstream branch. This is mainly helpful
-for persistent branches that change on the remote side.
-
-There is a similar rebase feature that rebases onto the **default** branch instead:
-
-```
-$ grm wt rebase
-[✔] master: Done
-[✔] my-cool-branch: Done
-```
-
-This is super helpful for feature branches. If you want to incorporate changes
-made on the remote branches, use `grm wt rebase` and all your branches will
-be up to date. If you want to also update to remote tracking branches in one go,
-use the `--pull` flag, and `--rebase` if you want to rebase instead of aborting
-on non-fast-forwards:
-
-```
-$ grm wt rebase --pull --rebase
-[✔] master: Done
-[✔] my-cool-branch: Done
-```
-
-"So, what's the difference between `pull --rebase` and `rebase --pull`? Why the
-hell is there a `--rebase` flag in the `rebase` command?"
-
-Yes, it's kind of weird. Remember that `pull` only ever updates each worktree
-to their remote branch, if possible. `rebase` rebases onto the **default** branch
-instead. The switches to `rebase` are just convenience, so you do not have to
-run two commands.
-
-* `rebase --pull` is the same as `pull` && `rebase`
-* `rebase --pull --rebase` is the same as `pull --rebase` && `rebase`
-
-I understand that the UX is not the most intuitive. If you can think of an
-improvement, please let me know (e.g. via an GitHub issue)!
-
-As with `pull`, `rebase` will also refuse to run when there are changes in your
-worktree. And you can also use the `--stash` option to stash/unstash changes
-automatically.
-
-### Manual access
-
-GRM isn't doing any magic, it's just git under the hood. If you need to have access
-to the underlying git repository, you can always do this:
+GRM isn't doing any magic, it's just git under the hood. If you need to have
+access to the underlying git repository, you can always do this:

 ```
 $ git --git-dir ./.git-main-working-tree [...]
 ```

 This should never be required (whenever you have to do this, you can consider
-this a bug in GRM and open an [issue](https://github.com/hakoerber/git-repo-manager/issues/new),
-but it may help in a pinch.
+this a bug in GRM and open an
+[issue](https://github.com/hakoerber/git-repo-manager/issues/new), but it may
+help in a pinch.

--- a/e2e_tests/helpers.py
+++ b/e2e_tests/helpers.py
@@ -28,7 +28,7 @@ def get_temporary_directory(dir=None):
 def grm(args, cwd=None, is_invalid=False):
    cmd = subprocess.run([binary] + args, cwd=cwd, capture_output=True, text=True)
    if not is_invalid:
-        assert "USAGE" not in cmd.stderr
+        assert "usage" not in cmd.stderr.lower()
    print(f"grmcmd: {args}")
    print(f"stdout:\n{cmd.stdout}")
    print(f"stderr:\n{cmd.stderr}")
--- a/e2e_tests/test_basic.py
+++ b/e2e_tests/test_basic.py
@@ -5,9 +5,9 @@ from helpers import *

 def test_invalid_command():
    cmd = grm(["whatever"], is_invalid=True)
-    assert "USAGE" in cmd.stderr
+    assert "usage" in cmd.stderr.lower()


 def test_help():
    cmd = grm(["--help"])
-    assert "USAGE" in cmd.stdout
+    assert "usage" in cmd.stdout.lower()
--- a/e2e_tests/test_worktrees.py
+++ b/e2e_tests/test_worktrees.py
@@ -70,7 +70,7 @@ def test_worktree_add(
        explicit_track_branch_name = f"{default_remote}/{worktree_name}"

    timestamp = datetime.datetime.now().replace(microsecond=0).isoformat()
-    # GitPython has some weird behaviour here. It is not possible to use kwargs
+    # GitPython has some weird behavior here. It is not possible to use kwargs
    # to set the commit and author date.
    #
    # `committer_date=x` (which is documented) does not work, as `git commit`
@@ -79,7 +79,7 @@ def test_worktree_add(
    # `author_date=x` does not work, as it's now called --date in `git commit`
    #
    # `date=x` should work, but is refused by GitPython, as it does not know
-    # about the new behaviour in `git commit`
+    # about the new behavior in `git commit`
    #
    # Fortunately, there are env variables that control those timestamps.
    os.environ["GIT_COMMITTER_DATE"] = str(timestamp)
@@ -581,6 +581,7 @@ def test_worktree_delete():

        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
        assert cmd.returncode == 0
+        assert len(cmd.stdout.strip().split("\n")) == 1
        assert "test" not in os.listdir(base_dir)

        cmd = grm(["wt", "add", "check"], cwd=base_dir)
@@ -607,6 +608,7 @@ def test_worktree_delete_in_subfolder(has_other_worktree):

        cmd = grm(["wt", "delete", "dir/test"], cwd=base_dir)
        assert cmd.returncode == 0
+        assert len(cmd.stdout.strip().split("\n")) == 1
        if has_other_worktree is True:
            assert {"test2"} == set(os.listdir(os.path.join(base_dir, "dir")))
        else:
@@ -621,6 +623,7 @@ def test_worktree_delete_refusal_no_tracking_branch():
        before = checksum_directory(f"{base_dir}/test")
        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
        assert cmd.returncode != 0
+        assert len(cmd.stdout) == 0
        stderr = cmd.stderr.lower()
        assert "refuse" in stderr or "refusing" in stderr
        assert "test" in os.listdir(base_dir)
@@ -629,94 +632,45 @@ def test_worktree_delete_refusal_no_tracking_branch():
        assert before == after


-def test_worktree_delete_refusal_uncommited_changes_new_file():
+@pytest.mark.parametrize(
+    "reason",
+    (
+        "new_file",
+        "changed_file",
+        "deleted_file",
+        "new_commit",
+        "tracking_branch_mismatch",
+    ),
+)
+def test_worktree_delete_refusal(reason):
    with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
        cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
        assert cmd.returncode == 0

-        shell(f"cd {base_dir}/test && touch changed_file")
-
-        before = checksum_directory(f"{base_dir}/test")
-        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
-        assert cmd.returncode != 0
-        stderr = cmd.stderr.lower()
-        assert "refuse" in stderr or "refusing" in stderr
-        assert "test" in os.listdir(base_dir)
-
-        after = checksum_directory(f"{base_dir}/test")
-        assert before == after
-
-
-def test_worktree_delete_refusal_uncommited_changes_changed_file():
-    with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
-        cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
-        assert cmd.returncode == 0
-
-        shell(f"cd {base_dir}/test && git ls-files | shuf | head | xargs rm -rf")
-
-        before = checksum_directory(f"{base_dir}/test")
-        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
-        assert cmd.returncode != 0
-        stderr = cmd.stderr.lower()
-        assert "refuse" in stderr or "refusing" in stderr
-        assert "test" in os.listdir(base_dir)
-
-        after = checksum_directory(f"{base_dir}/test")
-        assert before == after
-
-
-def test_worktree_delete_refusal_uncommited_changes_deleted_file():
-    with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
-        cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
-        assert cmd.returncode == 0
-
-        shell(
-            f"cd {base_dir}/test && git ls-files | shuf | head | while read f ; do echo $RANDOM > $f ; done"
-        )
-
-        before = checksum_directory(f"{base_dir}/test")
-        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
-        assert cmd.returncode != 0
-        stderr = cmd.stderr.lower()
-        assert "refuse" in stderr or "refusing" in stderr
-        assert "test" in os.listdir(base_dir)
-
-        after = checksum_directory(f"{base_dir}/test")
-        assert before == after
-
-
-def test_worktree_delete_refusal_commited_changes():
-    with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
-        cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
-        assert cmd.returncode == 0
-
-        shell(
-            f'cd {base_dir}/test && touch changed_file && git add changed_file && git commit -m "commitmsg"'
-        )
-
-        before = checksum_directory(f"{base_dir}/test")
-        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
-        assert cmd.returncode != 0
-        stderr = cmd.stderr.lower()
-        assert "refuse" in stderr or "refusing" in stderr
-        assert "test" in os.listdir(base_dir)
-
-        after = checksum_directory(f"{base_dir}/test")
-        assert before == after
-
-
-def test_worktree_delete_refusal_tracking_branch_mismatch():
-    with TempGitRepositoryWorktree.get(funcname()) as (base_dir, _commit):
-        cmd = grm(["wt", "add", "test", "--track", "origin/test"], cwd=base_dir)
-        assert cmd.returncode == 0
-
-        shell(
-            f"cd {base_dir}/test && git push origin test && git reset --hard origin/test^"
-        )
+        if reason == "new_file":
+            shell(f"cd {base_dir}/test && touch changed_file")
+        elif reason == "changed_file":
+            shell(
+                f"cd {base_dir}/test && git ls-files | shuf | head | while read f ; do echo $RANDOM > $f ; done"
+            )
+        elif reason == "deleted_file":
+            shell(f"cd {base_dir}/test && git ls-files | shuf | head | xargs rm -rf")
+        elif reason == "new_commit":
+            shell(
+                f'cd {base_dir}/test && touch changed_file && git add changed_file && git commit -m "commitmsg"'
+            )
+        elif reason == "tracking_branch_mismatch":
+            shell(
+                f"cd {base_dir}/test && git push origin test && git reset --hard origin/test^"
+            )
+
+        else:
+            raise NotImplementedError()

        before = checksum_directory(f"{base_dir}/test")
        cmd = grm(["wt", "delete", "test"], cwd=base_dir)
        assert cmd.returncode != 0
+        assert len(cmd.stdout) == 0
        stderr = cmd.stderr.lower()
        assert "refuse" in stderr or "refusing" in stderr
        assert "test" in os.listdir(base_dir)
@@ -732,6 +686,7 @@ def test_worktree_delete_force_refusal():

        cmd = grm(["wt", "delete", "test", "--force"], cwd=base_dir)
        assert cmd.returncode == 0
+        assert len(cmd.stdout.strip().split("\n")) == 1
        assert "test" not in os.listdir(base_dir)


--- a/release.sh
+++ b/release.sh
@@ -5,7 +5,7 @@ set -o errexit
 set -o pipefail

 usage() {
-    printf '%s\n' "usage: $0 (master|minor|patch)" >&2
+    printf '%s\n' "usage: $0 (major|minor|patch)" >&2
 }

 if (($# != 1)); then
@@ -24,6 +24,9 @@ major)
    ((major++)) || true
    minor=0
    patch=0
+
+    printf '%s\n' "Are you sure you want to release 1.x?" >&2
+    exit 1
    ;;
 minor)
    ((minor++)) || true
@@ -91,10 +94,6 @@ if ((changes == 0)); then
    exit 1
 fi

-just update-dependencies
-
-just check
-
 sed -i "0,/^version/{s/^version.*$/version = \"${new_version}\"/}" Cargo.toml

 cargo update --package git-repo-manager --precise "${new_version}"
--- a/src/config.rs
+++ b/src/config.rs
@@ -52,7 +52,6 @@ pub struct ConfigProvider {
    pub api_url: Option<String>,

    pub worktree: Option<bool>,
-    pub init_worktree: Option<bool>,

    pub remote_name: Option<String>,
 }
--- a/src/grm/cmd.rs
+++ b/src/grm/cmd.rs
@@ -1,4 +1,4 @@
-use clap::{AppSettings, Parser};
+use clap::Parser;

 #[derive(Parser)]
 #[clap(
@@ -7,7 +7,6 @@ use clap::{AppSettings, Parser};
    author = clap::crate_authors!("\n"),
    about = clap::crate_description!(),
    long_version = clap::crate_version!(),
-    global_setting(AppSettings::DeriveDisplayOrder),
    propagate_version = true,
 )]
 pub struct Opts {
@@ -65,7 +64,7 @@ pub struct FindLocalArgs {
    pub path: String,

    #[clap(
-        arg_enum,
+        value_enum,
        short,
        long,
        help = "Format to produce",
@@ -85,7 +84,7 @@ pub struct FindConfigArgs {
    pub config: String,

    #[clap(
-        arg_enum,
+        value_enum,
        short,
        long,
        help = "Format to produce",
@@ -100,14 +99,14 @@ pub struct FindRemoteArgs {
    #[clap(short, long, help = "Path to the configuration file")]
    pub config: Option<String>,

-    #[clap(arg_enum, short, long, help = "Remote provider to use")]
+    #[clap(value_enum, short, long, help = "Remote provider to use")]
    pub provider: RemoteProvider,

    #[clap(short, long, help = "Name of the remote to use")]
    pub remote_name: Option<String>,

    #[clap(
-        multiple_occurrences = true,
+        action = clap::ArgAction::Append,
        name = "user",
        long,
        help = "Users to get repositories from"
@@ -115,7 +114,7 @@ pub struct FindRemoteArgs {
    pub users: Vec<String>,

    #[clap(
-        multiple_occurrences = true,
+        action = clap::ArgAction::Append,
        name = "group",
        long,
        help = "Groups to get repositories from"
@@ -138,7 +137,7 @@ pub struct FindRemoteArgs {
    pub root: String,

    #[clap(
-        arg_enum,
+        value_enum,
        short,
        long,
        help = "Format to produce",
@@ -149,11 +148,10 @@ pub struct FindRemoteArgs {
    #[clap(
        long,
        help = "Use worktree setup for repositories",
-        possible_values = &["true", "false"],
+        value_parser = ["true", "false"],
        default_value = "false",
        default_missing_value = "true",
-        min_values = 0,
-        max_values = 1,
+        num_args = 0..=1,
    )]
    pub worktree: String,

@@ -174,12 +172,11 @@ pub struct Config {

    #[clap(
        long,
+        value_parser = ["true", "false"],
        help = "Check out the default worktree after clone",
-        possible_values = &["true", "false"],
        default_value = "true",
        default_missing_value = "true",
-        min_values = 0,
-        max_values = 1,
+        num_args = 0..=1,
    )]
    pub init_worktree: String,
 }
@@ -189,14 +186,14 @@ pub type RemoteProvider = super::provider::RemoteProvider;
 #[derive(Parser)]
 #[clap()]
 pub struct SyncRemoteArgs {
-    #[clap(arg_enum, short, long, help = "Remote provider to use")]
+    #[clap(value_enum, short, long, help = "Remote provider to use")]
    pub provider: RemoteProvider,

    #[clap(short, long, help = "Name of the remote to use")]
    pub remote_name: Option<String>,

    #[clap(
-        multiple_occurrences = true,
+        action = clap::ArgAction::Append,
        name = "user",
        long,
        help = "Users to get repositories from"
@@ -204,7 +201,7 @@ pub struct SyncRemoteArgs {
    pub users: Vec<String>,

    #[clap(
-        multiple_occurrences = true,
+        action = clap::ArgAction::Append,
        name = "group",
        long,
        help = "Groups to get repositories from"
@@ -229,11 +226,10 @@ pub struct SyncRemoteArgs {
    #[clap(
        long,
        help = "Use worktree setup for repositories",
-        possible_values = &["true", "false"],
+        value_parser = ["true", "false"],
        default_value = "false",
        default_missing_value = "true",
-        min_values = 0,
-        max_values = 1,
+        num_args = 0..=1,
    )]
    pub worktree: String,

@@ -243,11 +239,10 @@ pub struct SyncRemoteArgs {
    #[clap(
        long,
        help = "Check out the default worktree after clone",
-        possible_values = &["true", "false"],
+        value_parser = ["true", "false"],
        default_value = "true",
        default_missing_value = "true",
-        min_values = 0,
-        max_values = 1,
+        num_args = 0..=1,
    )]
    pub init_worktree: String,
 }
@@ -259,7 +254,7 @@ pub struct OptionalConfig {
    pub config: Option<String>,
 }

-#[derive(clap::ArgEnum, Clone)]
+#[derive(clap::ValueEnum, Clone)]
 pub enum ConfigFormat {
    Yaml,
    Toml,
@@ -299,7 +294,7 @@ pub struct WorktreeAddArgs {
    #[clap(short = 't', long = "track", help = "Remote branch to track")]
    pub track: Option<String>,

-    #[clap(long = "--no-track", help = "Disable tracking")]
+    #[clap(long = "no-track", help = "Disable tracking")]
    pub no_track: bool,
 }
 #[derive(Parser)]
@@ -328,22 +323,19 @@ pub struct WorktreeFetchArgs {}

 #[derive(Parser)]
 pub struct WorktreePullArgs {
-    #[clap(long = "--rebase", help = "Perform a rebase instead of a fast-forward")]
+    #[clap(long = "rebase", help = "Perform a rebase instead of a fast-forward")]
    pub rebase: bool,
-    #[clap(long = "--stash", help = "Stash & unstash changes before & after pull")]
+    #[clap(long = "stash", help = "Stash & unstash changes before & after pull")]
    pub stash: bool,
 }

 #[derive(Parser)]
 pub struct WorktreeRebaseArgs {
-    #[clap(long = "--pull", help = "Perform a pull before rebasing")]
+    #[clap(long = "pull", help = "Perform a pull before rebasing")]
    pub pull: bool,
-    #[clap(long = "--rebase", help = "Perform a rebase when doing a pull")]
+    #[clap(long = "rebase", help = "Perform a rebase when doing a pull")]
    pub rebase: bool,
-    #[clap(
-        long = "--stash",
-        help = "Stash & unstash changes before & after rebase"
-    )]
+    #[clap(long = "stash", help = "Stash & unstash changes before & after rebase")]
    pub stash: bool,
 }

--- a/src/provider/mod.rs
+++ b/src/provider/mod.rs
@@ -16,7 +16,7 @@ use std::collections::HashMap;

 const DEFAULT_REMOTE_NAME: &str = "origin";

-#[derive(Debug, Deserialize, Serialize, clap::ArgEnum, Clone)]
+#[derive(Debug, Deserialize, Serialize, clap::ValueEnum, Clone)]
 pub enum RemoteProvider {
    #[serde(alias = "github", alias = "GitHub")]
    Github,
--- a/src/repo.rs
+++ b/src/repo.rs
@@ -233,7 +233,7 @@ impl Worktree {
                    let operation = operation.map_err(convert_libgit2_error)?;

                    // This is required to preserve the commiter of the rebased
-                    // commits, which is the expected behaviour.
+                    // commits, which is the expected behavior.
                    let rebased_commit = repo
                        .0
                        .find_commit(operation.id())
@@ -357,7 +357,7 @@ impl Worktree {
            let operation = operation.map_err(convert_libgit2_error)?;

            // This is required to preserve the commiter of the rebased
-            // commits, which is the expected behaviour.
+            // commits, which is the expected behavior.
            let rebased_commit = repo
                .0
                .find_commit(operation.id())
@@ -1268,7 +1268,6 @@ impl RepoHandle {
        if let Some(current_dir) = worktree_dir.parent() {
            for current_dir in current_dir.ancestors() {
                let current_dir = base_dir.join(current_dir);
-                println!("deleting {}", current_dir.display());
                if current_dir
                    .read_dir()
                    .map_err(|error| {
@@ -1281,7 +1280,7 @@ impl RepoHandle {
                    .next()
                    .is_none()
                {
-                    if let Err(e) = std::fs::remove_dir_all(&current_dir) {
+                    if let Err(e) = std::fs::remove_dir(&current_dir) {
                        return Err(WorktreeRemoveFailureReason::Error(format!(
                            "Error deleting {}: {}",
                            &worktree_dir.display(),
--- a/src/table.rs
+++ b/src/table.rs
@@ -185,7 +185,11 @@ pub fn get_status_table(config: config::Config) -> Result<(Vec<Table>, Vec<Strin
                }
            };

-            add_repo_status(&mut table, &repo.name, &repo_handle, repo.worktree_setup)?;
+            if let Err(err) =
+                add_repo_status(&mut table, &repo.name, &repo_handle, repo.worktree_setup)
+            {
+                errors.push(format!("{}: Couldn't add repo status: {}", &repo.name, err));
+            }
        }

        tables.push(table);
--- a/src/tree.rs
+++ b/src/tree.rs
@@ -60,7 +60,11 @@ pub fn sync_trees(config: config::Config, init_worktree: bool) -> Result<bool, S

        match find_unmanaged_repos(&root_path, &repos) {
            Ok(repos) => {
-                unmanaged_repos_absolute_paths.extend(repos);
+                for path in repos.into_iter() {
+                    if !unmanaged_repos_absolute_paths.contains(&path) {
+                        unmanaged_repos_absolute_paths.push(path);
+                    }
+                }
            }
            Err(error) => {
                print_error(&format!("Error getting unmanaged repos: {}", error));
--- a/src/worktree.rs
+++ b/src/worktree.rs
@@ -81,9 +81,9 @@
 //! * Instead of just picking `origin/prefix/foobar`, grm will complain because
 //!   it also selected `remote2/foobar`.
 //!
-//! This is just emergent behaviour of the logic above. Fixing it would require
+//! This is just emergent behavior of the logic above. Fixing it would require
 //! additional logic for that edge case. I assume that it's just so rare to get
-//! that behaviour that it's acceptable for now.
+//! that behavior that it's acceptable for now.
 //!
 //! Now we either have a commit, we aborted, or we do not have commit. In the
 //! last case, as stated above, we check out the "default" branch.
@@ -137,7 +137,7 @@
 //! `foobar`. As both `remote1/foobar` and `remote2/foobar` as the same, the new
 //! worktree will use that as the state of the new branch. But as `grm` cannot
 //! tell which remote branch to track, it will not set up remote tracking. This
-//! behaviour may be a bit confusing, but first, there is no good way to resolve
+//! behavior may be a bit confusing, but first, there is no good way to resolve
 //! this, and second, the situation should be really rare (when having multiple
 //! remotes, you would generally have a `default_remote` configured).
 //!
@@ -372,7 +372,7 @@ impl<'a> Worktree<'a, WithRemoteTrackingBranch<'a>> {
                // TECHDEBT
                // We must not call this with `Some()` without a valid target.
                // I'm sure this can be improved, just not sure how.
-                &*self.extra.target_commit.unwrap(),
+                &self.extra.target_commit.unwrap(),
            )?
        };

@@ -463,7 +463,7 @@ impl<'a> Worktree<'a, WithRemoteTrackingBranch<'a>> {
                //
                // > failed to make directory '/{repo}/.git-main-working-tree/worktrees/dir/test
                //
-                // This is a discrepancy between the behaviour of libgit2 and the
+                // This is a discrepancy between the behavior of libgit2 and the
                // git CLI when creating worktrees with slashes:
                //
                // The git CLI will create the worktree's configuration directory
Author	SHA1	Message	Date
Hannes Körber	85dd794b53	Cargo.lock: Updating tracing v0.1.36 -> v0.1.37	2022-10-10 18:06:27 +02:00
Hannes Körber	be8d85cb66	dependencies: Update serde_json to 1.0.86	2022-10-10 18:06:25 +02:00
Hannes Körber	0b7527fc7d	dependencies: Update clap to 4.0.11	2022-10-10 18:06:25 +02:00
Hannes Körber	3a568a774a	Remove init_worktree from sync config It was currently unused and only confuses. The initialization of worktrees can currently only be controlled via the `--init-worktree` command line switch. This is unfortunate, but it's the only was to handle it right now. Changing it would mean a restructure of the code, mainly the `tree::sync_trees` function.	2022-10-06 12:59:56 +02:00
Hannes Körber	a6ecb66547	Merge branch 'develop'	2022-10-06 12:38:32 +02:00
Hannes Körber	8a04db8130	Release v0.7.9	2022-10-06 12:38:32 +02:00
Hannes Körber	d5bbbe6171	just: Use bash explicitly	2022-10-06 12:28:20 +02:00
Hannes Körber	c6a27525fd	Remove unnecessary deref	2022-10-06 12:20:30 +02:00
Hannes Körber	5880066531	cli: Update code for clap v4	2022-10-06 12:17:26 +02:00
Hannes Körber	918b63047b	Cargo.lock: Updating thiserror v1.0.35 -> v1.0.37	2022-10-06 11:36:53 +02:00
Hannes Körber	0fa2a65c81	Cargo.lock: Updating openssl-sys v0.9.75 -> v0.9.76	2022-10-06 11:36:52 +02:00
Hannes Körber	87d5b7ad85	Cargo.lock: Updating crossbeam-utils v0.8.11 -> v0.8.12	2022-10-06 11:36:50 +02:00
Hannes Körber	7db3596302	Cargo.lock: Updating smallvec v1.9.0 -> v1.10.0	2022-10-06 11:36:49 +02:00
Hannes Körber	e65c744f9c	Cargo.lock: Updating jobserver v0.1.24 -> v0.1.25	2022-10-06 11:36:48 +02:00
Hannes Körber	bd79602d3a	dependencies: Update console to 0.15.2	2022-10-06 11:36:47 +02:00
Hannes Körber	6e876aaefc	dependencies: Update clap to 4.0.10	2022-10-06 11:36:47 +02:00
Hannes Körber	04753e8d9c	Merge branch 'develop'	2022-09-23 07:19:03 +02:00
Hannes Körber	5811476e27	Release v0.7.8	2022-09-23 07:19:03 +02:00
Hannes Körber	5ac814b857	Cargo.lock: Updating idna v0.2.3 -> v0.3.0	2022-09-23 07:05:43 +02:00
Hannes Körber	3a87772606	Cargo.lock: Updating form_urlencoded v1.0.1 -> v1.1.0	2022-09-23 07:05:40 +02:00
Hannes Körber	001911bed9	Cargo.lock: Updating thiserror v1.0.32 -> v1.0.35	2022-09-23 07:05:37 +02:00
Hannes Körber	d1d729c33d	Cargo.lock: Updating socket2 v0.4.6 -> v0.4.7	2022-09-23 07:05:35 +02:00
Hannes Körber	b4cabae4ec	Cargo.lock: Updating lock_api v0.4.8 -> v0.4.9	2022-09-23 07:05:33 +02:00
Hannes Körber	196bbeb2c2	Cargo.lock: Updating aho-corasick v0.7.18 -> v0.7.19	2022-09-23 07:05:30 +02:00
Hannes Körber	4d60012f44	dependencies: Update serde_yaml to 0.9.13	2022-09-23 07:05:30 +02:00
Hannes Körber	b2f413b033	dependencies: Update clap to 3.2.22	2022-09-23 07:05:30 +02:00
Hannes Körber	c25bb8bf55	dependencies: Update serde to 1.0.145	2022-09-23 07:05:30 +02:00
Hannes Körber	3b923e3e13	Merge pull request #44 from vrischmann/name-in-error catch the error returned by add_repo_status	2022-09-23 07:03:40 +02:00
Vincent Rischmann	061265bbd0	catch the error returned by add_repo_status If add_repo_status returns an error it will eventually be printed to the user but there won't be any repository information: [✘] Error getting status: No branch checked out Catch the error earlier so we can print the repository name: [✘] Error: freebsd-src: Couldn't add repo status: No branch checked out	2022-09-22 21:10:16 +02:00
Hannes Körber	a08a8d2000	Merge branch 'develop'	2022-08-29 21:10:53 +02:00
Hannes Körber	fea0299c95	Release v0.7.7	2022-08-29 21:10:53 +02:00
Hannes Körber	444930199c	Update README	2022-08-29 20:25:34 +02:00
Hannes Körber	95704b9a40	Cargo.lock: Updating pin-project v1.0.11 -> v1.0.12	2022-08-29 20:05:54 +02:00
Hannes Körber	8d300827d0	Cargo.lock: Updating futures-io v0.3.21 -> v0.3.24	2022-08-29 20:05:51 +02:00
Hannes Körber	9ab79b120a	Cargo.lock: Updating fastrand v1.7.0 -> v1.8.0	2022-08-29 20:05:48 +02:00
Hannes Körber	8cc9470aca	Cargo.lock: Updating curl v0.4.43 -> v0.4.44	2022-08-29 20:05:45 +02:00
Hannes Körber	9e95701a6e	Cargo.lock: Updating crossbeam-utils v0.8.10 -> v0.8.11	2022-08-29 20:05:43 +02:00
Hannes Körber	fe90401688	Cargo.lock: Updating bytes v1.2.0 -> v1.2.1	2022-08-29 20:05:42 +02:00
Hannes Körber	aeaaee9915	Cargo.lock: Updating async-channel v1.6.1 -> v1.7.1	2022-08-29 20:05:41 +02:00
Hannes Körber	52b024c1ba	dependencies: Update serde_json to 1.0.85	2022-08-29 20:05:40 +02:00
Hannes Körber	3a95613132	dependencies: Update serde_yaml to 0.9.10	2022-08-29 20:05:40 +02:00
Hannes Körber	2ea2c994d8	dependencies: Update comfy-table to 6.1.0	2022-08-29 20:05:40 +02:00
Hannes Körber	04686b6dfa	dependencies: Update console to 0.15.1	2022-08-29 20:05:40 +02:00
Hannes Körber	78201d4759	dependencies: Update clap to 3.2.18	2022-08-29 20:05:40 +02:00
Hannes Körber	5fe6600dc3	dependencies: Update shellexpand to 2.1.2	2022-08-29 20:05:40 +02:00
Hannes Körber	2a65f78cd4	dependencies: Update git2 to 0.15.0	2022-08-29 20:05:40 +02:00
Hannes Körber	4852dad71e	dependencies: Update serde to 1.0.144	2022-08-29 20:05:40 +02:00
Hannes Körber	0746be904a	Merge branch 'develop'	2022-07-21 20:05:57 +02:00
Hannes Körber	53c2ee404c	Release v0.7.6	2022-07-21 20:05:57 +02:00
Hannes Körber	bd694c3f7d	just: Add pushall target for easier releases	2022-07-21 20:05:22 +02:00
Hannes Körber	95e9fcbffe	Cargo.lock: Updating pin-project v1.0.10 -> v1.0.11	2022-07-21 19:49:53 +02:00
Hannes Körber	98665a3231	Cargo.lock: Updating openssl-sys v0.9.74 -> v0.9.75	2022-07-21 19:49:48 +02:00
Hannes Körber	7a51ad135f	Cargo.lock: Updating rustversion v1.0.7 -> v1.0.8	2022-07-21 19:49:46 +02:00
Hannes Körber	e386935bc7	Cargo.lock: Updating bytes v1.1.0 -> v1.2.0	2022-07-21 19:49:44 +02:00
Hannes Körber	c62562e6f0	dependencies: Update serde_yaml to 0.8.26	2022-07-21 19:49:43 +02:00
Hannes Körber	00e37996b7	dependencies: Update regex to 1.6.0	2022-07-21 19:49:43 +02:00
Hannes Körber	a7e2c61984	dependencies: Update clap to 3.2.14	2022-07-21 19:49:43 +02:00
Hannes Körber	58919b2d58	dependencies: Update serde to 1.0.140	2022-07-21 19:49:42 +02:00
Hannes Körber	dd36eb886f	Merge pull request #42 from hakoerber/dependabot/cargo/openssl-src-111.22.01.1.1q build(deps): bump openssl-src from 111.21.0+1.1.1p to 111.22.0+1.1.1q	2022-07-07 08:01:05 +02:00
dependabot[bot]	d2e01db0ae	build(deps): bump openssl-src from 111.21.0+1.1.1p to 111.22.0+1.1.1q Bumps [openssl-src](https://github.com/alexcrichton/openssl-src-rs) from 111.21.0+1.1.1p to 111.22.0+1.1.1q. - [Release notes](https://github.com/alexcrichton/openssl-src-rs/releases) - [Commits](https://github.com/alexcrichton/openssl-src-rs/commits) --- updated-dependencies: - dependency-name: openssl-src dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2022-07-07 05:55:19 +00:00
Hannes Körber	bfd7b01ea4	Use en_US for spelling	2022-06-30 20:33:51 +02:00
Hannes Körber	da7a499da0	Merge branch 'develop'	2022-06-30 20:26:24 +02:00
Hannes Körber	64965c32dd	Release v0.7.5	2022-06-30 20:26:24 +02:00
Hannes Körber	3207bdfdfb	Add wait helper to Justfile	2022-06-30 20:02:36 +02:00
Hannes Körber	d8dd604174	Use safer method to remove empty directory	2022-06-30 19:59:46 +02:00
Hannes Körber	7ca9459675	Update release script to not run "just check"	2022-06-30 19:58:04 +02:00
Hannes Körber	989b0cdcce	e2e: Refactor worktree delete removal tests	2022-06-30 19:56:29 +02:00
Hannes Körber	64d8397092	Remove debug output	2022-06-30 19:56:22 +02:00
Hannes Körber	a1b054a672	e2e: Fix method name	2022-06-30 19:56:22 +02:00
Hannes Körber	193c96c5aa	e2e: Check for stdout on "worktree delete"	2022-06-30 19:56:22 +02:00
Hannes Körber	ee973432be	Update documentation	2022-06-30 19:34:07 +02:00
Hannes Körber	38d0252101	dependencies: Update clap to 3.2.8	2022-06-30 19:17:19 +02:00
Hannes Körber	280048264e	Cargo.lock: Updating smallvec v1.8.1 -> v1.9.0	2022-06-30 19:08:03 +02:00
Hannes Körber	129111273d	Add Justfile target for release	2022-06-30 19:08:03 +02:00
Hannes Körber	d62a19d741	Do not update dependencies on each release	2022-06-30 19:08:03 +02:00
Hannes Körber	e34a6243c0	Add pretection against accidential 1.0 release	2022-06-30 19:08:03 +02:00
Hannes Körber	4464bb607b	Fix usage output of release.sh	2022-06-30 19:08:03 +02:00
Hannes Körber	48fa888f9b	Print each unmanaged repo only once	2022-06-30 19:08:03 +02:00