9
top 5 comments
sorted by: hot top new old
[-] jdnewmil@lemmy.ca 6 points 2 years 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.

[-] technom@programming.dev 2 points 2 years ago

Diff is only a viewing option

It isn't. Git uses 3-way diff/merge algorithm quite liberally behind the scenes.

[-] SaintWacko@midwest.social 5 points 2 years 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 1 points 2 years ago* (last edited 2 years ago)

Depends on context.

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

[-] technom@programming.dev 1 points 2 years ago* (last edited 2 years 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.

this post was submitted on 05 Jan 2024
9 points (100.0% liked)

Git

4740 readers
1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

  1. Follow programming.dev rules
  2. Be excellent to each other, no hostility towards users for any reason
  3. No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 3 years ago
MODERATORS