• jdnewmil@lemmy.ca
    link
    fedilink
    arrow-up
    6
    ·
    9 months ago

    Who we?

    I think of them as snapshots organized in a directed acyclic graph (DAG).

    Diff is only a viewing option, or an optional compression implementation detail in packed history files.

  • SaintWacko@midwest.social
    link
    fedilink
    English
    arrow-up
    5
    ·
    9 months ago

    Trust me, it’s a diff. I’ve seen a repo get into a very stupid state where there were changes in the main branch that weren’t in the develop branch, but a PR didn’t pick up those charges because they were somehow not in any of the commits

  • Kissaki@programming.dev
    link
    fedilink
    English
    arrow-up
    1
    ·
    edit-2
    9 months ago

    Depends on context.

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

    • TechNom (nobody)@programming.dev
      link
      fedilink
      English
      arrow-up
      1
      ·
      edit-2
      9 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.