diff options
author | Rémy Coutable <remy@rymai.me> | 2017-10-25 12:42:25 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-10-25 12:42:25 +0000 |
commit | 53ab16f6fff4c73960f3324ac71db2c1a18b7c35 (patch) | |
tree | e84f9f886620f0d9c0bba123dd2ac4b9875dd1fd /PROCESS.md | |
parent | e81d74b9253e4a9f48bad0071bf37075bb6a20c5 (diff) | |
parent | a64601b9298d4b79bfc5d4f782b4dcc79ff33b74 (diff) | |
download | gitlab-ce-53ab16f6fff4c73960f3324ac71db2c1a18b7c35.tar.gz |
Merge branch 'gitaly-ff-merge-preparation' into 'master'
Move all rugged operation for ff_merge inside Gitlab::Git
Closes gitaly#683
See merge request gitlab-org/gitlab-ce!15011
Diffstat (limited to 'PROCESS.md')
0 files changed, 0 insertions, 0 deletions