4 ms·

TL;DR Use the Histogram diff algorithm in Git

• samatman 7y ago
  tl;dr `git config --global diff.algorithm histogram`
• Groxx 7y ago
  With pretty compelling examples showing Meyers (default) behavior that I've encountered many times. Nice. Yea, a fairly accurate TL;DR.
• allan_s 7y ago
  does someone know if it's possible to activate it in gitlab web diff of a merge request ?
  • leipert 7y ago
    Mhm. I would need to dive into our implementation. I don’t know whether we reimplement diffing algorithms in GitLab or rely on git internals here. [0] I am my phone, so I cannot check, but my two assumptions would be: Wr might use the default so that people have a match to what they see if they are diffing on their computers. And if it is confuigurable, probably just on an instance level, so you need to run GitLab yourself and not dot com Again just assumptions, will double check tomorrow. [0]: https://docs.gitlab.com/ee/administration/gitaly/ https://docs.gitlab.com/ee/administration/gitaly/
    • leipert 7y ago
      Checked in with the Gitaly team and we are using the default. I have created an issue about exploring support for different algorithms: https://gitlab.com/gitlab-org/gitaly/-/issues/2591 https://gitlab.com/gitlab-org/gitaly/-/issues/2591
      • allan_s 7y ago
        thank a lot for the issue
• fwip 7y ago
  I prefer using 'patience' most of the time, but it is slow on very large files.
  • hinkley 7y ago
    Seems histogram is a fork of patience. What do you prefer about it?
    • fwip 7y ago
      Interesting! I'll have to revisit my comparison I made a while ago, it's possible I read the results wrong and came away with the wrong conclusion. Thanks!