diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-19 13:11:08 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-19 13:11:08 +0300 |
| commit | fa0967179e7656dbd19915cfaabf0cb4ad3170c8 (patch) | |
| tree | 1d673fc12b662ab69f98837f3664dbb16ae6f8e3 /changelogs | |
| parent | 5526458b4bd4cbba9216793429036155e7b7ea0c (diff) | |
| parent | 0c325ce8f5bb934033448ccee0ac3e4105d68385 (diff) | |
Merge branch 'sh-fix-squash-rebase-utf8-data' into 'master'
Fix squash rebase not working when diff contained encoded data
Closes gitlab-ee#4960
See merge request gitlab-org/gitlab-ce!17205
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/sh-fix-squash-rebase-utf8-data.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/sh-fix-squash-rebase-utf8-data.yml b/changelogs/unreleased/sh-fix-squash-rebase-utf8-data.yml new file mode 100644 index 00000000000..aa43487d741 --- /dev/null +++ b/changelogs/unreleased/sh-fix-squash-rebase-utf8-data.yml @@ -0,0 +1,5 @@ +--- +title: Fix squash not working when diff contained non-ASCII data +merge_request: +author: +type: fixed |