• Kissaki
    link
    fedilink
    English
    arrow-up
    1
    ·
    edit-2
    11 months ago

    Depends on context.

    Most of the interfacing is change based. But calling that diff is misleading.

    • TechNom (nobody)
      link
      fedilink
      English
      arrow-up
      1
      ·
      edit-2
      11 months ago

      But calling that doff is misleading.

      Git actually uses diffs behind the scenes a lot - 3-way diffs/merges to be more accurate. Merging, rebasing, cherry picking and even reverting are all 3-way diff-merges.