diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-05-03 17:54:09 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-05-03 17:54:09 +0300 |
| commit | 1ec1ab52c2cc2295988ba55a0860b4992b5009cb (patch) | |
| tree | dd9be6da0ce41512b3591083db9fd80de9e9b9e1 | |
| parent | 59c158db25960ca6ab04afe31f78cb9071890857 (diff) | |
Version 1.34.2v1.34.2
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-use-3way-merge-for-squash.yml | 5 |
3 files changed, 7 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4eaddfac6..7fec1f018 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Gitaly changelog +## v1.34.2 + +#### Fixed +- Use 3-way merge for squashing commits + https://gitlab.com/gitlab-org/gitaly/merge_requests/1214 + ## v1.34.1 #### Security @@ -1 +1 @@ -1.34.1 +1.34.2 diff --git a/changelogs/unreleased/sh-use-3way-merge-for-squash.yml b/changelogs/unreleased/sh-use-3way-merge-for-squash.yml deleted file mode 100644 index f7a7b6642..000000000 --- a/changelogs/unreleased/sh-use-3way-merge-for-squash.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: Use 3-way merge for squashing commits -merge_request: 1214 -author: -type: fixed |