Skip to content
代码片段 群组 项目
该项目从 https://gitlab.com/gitlab-org/gitlab.git 镜像。 拉取镜像更新于
  1. 8月 18, 2020
  2. 7月 31, 2020
  3. 6月 25, 2020
  4. 6月 19, 2020
  5. 6月 15, 2020
  6. 6月 08, 2020
  7. 4月 21, 2020
  8. 3月 24, 2020
  9. 2月 04, 2020
  10. 12月 18, 2019
  11. 9月 12, 2019
  12. 7月 08, 2019
  13. 6月 14, 2019
  14. 4月 04, 2019
  15. 4月 01, 2019
  16. 3月 26, 2019
  17. 2月 05, 2019
  18. 2月 04, 2019
  19. 1月 15, 2019
  20. 12月 22, 2018
  21. 12月 14, 2018
  22. 12月 13, 2018
    • Yorick Peterse's avatar
      Reinstate changes lost due to automatic merging · 749ebc1c
      Yorick Peterse 创作于
      The automatic merging code used `--strategy=ours`, which turned out to
      be incorrect; instead we wanted `--strategy=recursive
      --strategy-option=ours`. This small difference results in merging
      throwing away _all_ EE changes in favour of CE changes, instead of only
      doing this for conflicts.
      
      This commit ensures that EE has all the appropriate changes. The diff
      was generated by cherry picking all merge commits made since two days
      ago, picking them with `--strategy=recursive --strategy-option=ours`.
      749ebc1c
  23. 12月 12, 2018
  24. 11月 20, 2018
  25. 10月 10, 2018
  26. 10月 05, 2018
  27. 7月 07, 2018
  28. 7月 02, 2018
  29. 6月 25, 2018
加载中