3 ms·

GitLab CEO here, in GitLab you can protect branches to not be rebased at all (web or command line), see https://about.gitlab.com/2014/11/26/keeping-your-code-pr

• c0wb0yc0d3r 12y ago
  On the page where the ssh finger print is listed, can you list the RSA finger print too? I am not well versed in working with git over ssh, but after following the instructions on GitLab to generate a key, then git would keep showing me the RSA finger print which doesn't match the one provided on the website. After looking around a bit, it looks like the one listed is ECDSA. tl;dr: It was late. Finger prints didn't match. Only logical assumption was NSA. :P (Not really, obviously, but the finger prints could be more clear.)
  • sytse 12y ago
    Thanks, fixed in https://gitlab.com/gitlab-com/www-gitlab-com/commit/2493f208743b079806e29e2ef7887dd87c3c9d81 https://gitlab.com/gitlab-com/www-gitlab-com/commit/2493f208...
    • sytse 12y ago
      Also, we added all other keys: https://gitlab.com/gitlab-com/www-gitlab-com/commit/79bdb63ff3184be6bf23788d3f2d7a55349f53d9 https://gitlab.com/gitlab-com/www-gitlab-com/commit/79bdb63f...
• gcb0 12y ago
  but you still damage your local copy and it's a pain to clean up, specially if you had local changes/commits
  • sytse 12y ago
    The idea is not to have upstream rebases so you can't pull them by accident.