You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
-`gix merge file` now uses `THEIRS` instead of `OURS` where needed ([`0727b56`](https://github.com/GitoxideLabs/gitoxide/commit/0727b5679f9ddeb05a9a50c895b6d77ba61ed544))
39
+
***Uncategorized**
40
+
- Merge pull request #1643 from cruessler/add-gix-log ([`29cb775`](https://github.com/GitoxideLabs/gitoxide/commit/29cb775e6b85265a4907e882a45621aeb0432564))
41
+
- Add first 'debug' version of `gix log` ([`c7e04e9`](https://github.com/GitoxideLabs/gitoxide/commit/c7e04e976989435ba752628522d53ac39348b49b))
42
+
- Merge pull request #1705 from GitoxideLabs/merge ([`520c832`](https://github.com/GitoxideLabs/gitoxide/commit/520c832cfcfb34eb7617be55ebe2719ab35595fd))
43
+
- Adapt to changes in `gix-diff` ([`960773e`](https://github.com/GitoxideLabs/gitoxide/commit/960773e5526d02e1f2294224859c821ed86a3463))
44
+
- Add `--tree-favor` to `gix merge tree|commit`. ([`471e046`](https://github.com/GitoxideLabs/gitoxide/commit/471e046a6002a68209e215db7ee904a4149f9d51))
45
+
- Merge pull request #1704 from GitoxideLabs/fix-1703 ([`e8ce25f`](https://github.com/GitoxideLabs/gitoxide/commit/e8ce25f8d752c383ad8aea45fc7710a6d4aeb2ef))
Copy file name to clipboardexpand all lines: gitoxide-core/CHANGELOG.md
+67-1
Original file line number
Diff line number
Diff line change
@@ -5,6 +5,71 @@ All notable changes to this project will be documented in this file.
5
5
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6
6
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7
7
8
+
## Unreleased
9
+
10
+
### New Features
11
+
12
+
- <csr-id-c7e04e976989435ba752628522d53ac39348b49b/> add first 'debug' version of `gix log`
13
+
It's primarily meant to better understand `gix blame`.
14
+
- <csr-id-471e046a6002a68209e215db7ee904a4149f9d51/> add `--tree-favor` to `gix merge tree|commit`.
15
+
With it one can decide which side to favor in case of
16
+
irreconcilable tree-conflicts.
17
+
18
+
### Bug Fixes
19
+
20
+
- <csr-id-42cdc3f533ac34812baa63f31a96475eacc83de6/> properly indicate the end of interaction
21
+
22
+
### New Features (BREAKING)
23
+
24
+
- <csr-id-e59fc09f12a1c6b27d878525ff6074ac846aa87e/> move all possible code from `gix` to `gix-protocol`.
25
+
For now, just move the code down and immediately re-integrate in `gix`
26
+
to be able to use its tests to validate it.
27
+
28
+
This is a breaking change as some types move and change the layout.
29
+
30
+
### Commit Statistics
31
+
32
+
<csr-read-only-do-not-edit/>
33
+
34
+
- 25 commits contributed to the release over the course of 28 calendar days.
35
+
- 28 days passed between releases.
36
+
- 4 commits were understood as [conventional](https://www.conventionalcommits.org).
37
+
- 0 issues like '(#ID)' were seen in commit messages
38
+
39
+
### Commit Details
40
+
41
+
<csr-read-only-do-not-edit/>
42
+
43
+
<details><summary>view details</summary>
44
+
45
+
***Uncategorized**
46
+
- Merge pull request #1734 from EliahKagan/nonfiles ([`ad6b9b6`](https://github.com/GitoxideLabs/gitoxide/commit/ad6b9b66aa3e3561e413d04d00f6dbf832d63353))
47
+
- Reword "non-files" in documentation comments ([`154b21f`](https://github.com/GitoxideLabs/gitoxide/commit/154b21f0e9beb0e5b6615f091f5f0716df6a3f7b))
48
+
- Adapt to changes in `gix-dir` ([`329a734`](https://github.com/GitoxideLabs/gitoxide/commit/329a734e0f5d23de2bd9af87f6da85cb6154a97c))
49
+
- Merge pull request #1643 from cruessler/add-gix-log ([`29cb775`](https://github.com/GitoxideLabs/gitoxide/commit/29cb775e6b85265a4907e882a45621aeb0432564))
50
+
- Trim `gix log` to be mergeable. ([`162887e`](https://github.com/GitoxideLabs/gitoxide/commit/162887e2d3968639548f7d3581cb1f47bfe38341))
51
+
- Add first 'debug' version of `gix log` ([`c7e04e9`](https://github.com/GitoxideLabs/gitoxide/commit/c7e04e976989435ba752628522d53ac39348b49b))
52
+
- Merge pull request #1731 from GitoxideLabs/fix-pack-receive ([`ca54b8c`](https://github.com/GitoxideLabs/gitoxide/commit/ca54b8c67eb6c81b7175f62ee74a0d5aab6f52cc))
53
+
- Assure we don't try to not have wants in pack-receive ([`377ca46`](https://github.com/GitoxideLabs/gitoxide/commit/377ca46162d9ecbb5e5e27eca889f95fd8556b50))
54
+
- Adapt to changes in `gix-protocol` ([`41b6571`](https://github.com/GitoxideLabs/gitoxide/commit/41b6571b9f331c018672fcd0bb7d5ce0f8885178))
55
+
- Properly indicate the end of interaction ([`42cdc3f`](https://github.com/GitoxideLabs/gitoxide/commit/42cdc3f533ac34812baa63f31a96475eacc83de6))
56
+
- Merge pull request #1730 from GitoxideLabs/fix-1729 ([`6822689`](https://github.com/GitoxideLabs/gitoxide/commit/6822689fca04c15e309f9ca41d610bca9cb93e3b))
57
+
- Adapt to changes in `gix-dir` ([`a7c4100`](https://github.com/GitoxideLabs/gitoxide/commit/a7c41008705b3c2777b467c60e5b5881021c5abf))
58
+
- Merge pull request #1727 from GitoxideLabs/dirwalk-ignore-non-regulars ([`69ee6a3`](https://github.com/GitoxideLabs/gitoxide/commit/69ee6a32dd221a1aae7b8c3817f90feacf577598))
59
+
- Adapt to changes in `gix-dir` ([`a49c960`](https://github.com/GitoxideLabs/gitoxide/commit/a49c960bf7e9ec41b3d0548a3aa6ccc90a59cc2b))
60
+
- Merge pull request #1726 from GitoxideLabs/radicle-tuning ([`a542775`](https://github.com/GitoxideLabs/gitoxide/commit/a54277561a62cd560a9a072c6052eaf182ad4ace))
61
+
- Adapt to changes in `gix-protocol` ([`25b8480`](https://github.com/GitoxideLabs/gitoxide/commit/25b848080c7df2da0fa662c580451aec0deb29c4))
62
+
- Merge pull request #1634 from GitoxideLabs/remove-delegates ([`ddeb97f`](https://github.com/GitoxideLabs/gitoxide/commit/ddeb97f550bb95835648841b476d7647dd7c1dc0))
63
+
- Adapt to changes in `gix` and `gix-protocol` ([`fcb21a4`](https://github.com/GitoxideLabs/gitoxide/commit/fcb21a4b4ad25eb3bb1a2116fa6e709e62e77c84))
64
+
- Move all possible code from `gix` to `gix-protocol`. ([`e59fc09`](https://github.com/GitoxideLabs/gitoxide/commit/e59fc09f12a1c6b27d878525ff6074ac846aa87e))
65
+
- Merge pull request #1705 from GitoxideLabs/merge ([`520c832`](https://github.com/GitoxideLabs/gitoxide/commit/520c832cfcfb34eb7617be55ebe2719ab35595fd))
66
+
- Adapt to changes in `gix-diff` ([`960773e`](https://github.com/GitoxideLabs/gitoxide/commit/960773e5526d02e1f2294224859c821ed86a3463))
67
+
- Adapt to changes in `gix` ([`9896d5d`](https://github.com/GitoxideLabs/gitoxide/commit/9896d5d3ccf629a811e518f0a3b7cbfc195b0b2a))
68
+
- Add `--tree-favor` to `gix merge tree|commit`. ([`471e046`](https://github.com/GitoxideLabs/gitoxide/commit/471e046a6002a68209e215db7ee904a4149f9d51))
69
+
- Adapt to changes in `gix-merge` ([`3228de6`](https://github.com/GitoxideLabs/gitoxide/commit/3228de627fd059db8abbad7f465023fa559b9b0e))
70
+
- Merge pull request #1701 from GitoxideLabs/release ([`e8b3b41`](https://github.com/GitoxideLabs/gitoxide/commit/e8b3b41dd79b8f4567670b1f89dd8867b6134e9e))
71
+
</details>
72
+
8
73
## 0.43.0 (2024-11-24)
9
74
10
75
### New Features
@@ -22,7 +87,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
22
87
23
88
<csr-read-only-do-not-edit/>
24
89
25
-
-18 commits contributed to the release.
90
+
-19 commits contributed to the release.
26
91
- 4 commits were understood as [conventional](https://www.conventionalcommits.org).
27
92
- 0 issues like '(#ID)' were seen in commit messages
28
93
@@ -33,6 +98,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Merge pull request #1718 from GitoxideLabs/with-shell-choice ([`801f9e9`](https://github.com/GitoxideLabs/gitoxide/commit/801f9e916a066bd222c2174033dacabf44f2d0b8))
43
+
- Allow to choose the shell to use with `Prepare::with_shell_program()`. ([`838420f`](https://github.com/GitoxideLabs/gitoxide/commit/838420ffa240c9953fdf6871065cb41e3028ca89))
44
+
- Merge pull request #1701 from GitoxideLabs/release ([`e8b3b41`](https://github.com/GitoxideLabs/gitoxide/commit/e8b3b41dd79b8f4567670b1f89dd8867b6134e9e))
45
+
</details>
46
+
8
47
## 0.3.11 (2024-11-24)
9
48
10
49
A maintenance release without user-facing changes.
@@ -13,7 +52,7 @@ A maintenance release without user-facing changes.
13
52
14
53
<csr-read-only-do-not-edit/>
15
54
16
-
-3 commits contributed to the release.
55
+
-4 commits contributed to the release.
17
56
- 0 commits were understood as [conventional](https://www.conventionalcommits.org).
18
57
- 0 issues like '(#ID)' were seen in commit messages
19
58
@@ -24,6 +63,7 @@ A maintenance release without user-facing changes.
- Prepare changelogs once more ([`9d627bb`](https://github.com/GitoxideLabs/gitoxide/commit/9d627bbc27322285e8d2ac3c5135ce425ad76838))
28
68
- Fix gix-path version (which fails publishing due to the patch-level mismatch) ([`4145d2a`](https://github.com/GitoxideLabs/gitoxide/commit/4145d2a4c385931731e69c793864ec9b4fd4b87f))
29
69
- Merge pull request #1642 from GitoxideLabs/new-release ([`db5c9cf`](https://github.com/GitoxideLabs/gitoxide/commit/db5c9cfce93713b4b3e249cff1f8cc1ef146f470))
0 commit comments