Skip to content

Many Repo Fixes -- EE merge edition

username-removed-892863 requested to merge ee-repo-fixes into master

EE merge edition of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13432

Also includes commits from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13472 that haven't made their way over to EE yet.

cc @jschatz1 - Does EE have anything different from CE?

Cherry-pick a bunch of commits

Save out all the commits you want to cherry-pick into a file,

~/commits-to-cherry-pick.txt

git log --reverse master..repo-fixes --format="%H"

Then run this loop:

  1. cat ~/commits-to-cherry-pick.txt | xargs -L1 git cherry-pick
  2. It will run until it hits some conflicts. Resolve the conflicts
  3. Remove the commits from the file up to include the commit you just resolved
  4. Repeat
Edited by username-removed-892863

Merge request reports