Git VS vscode-gitlens

Boy, I can't find this either (but also, the kernel mailing list is _really_ difficult to search). I really remember Linus saying something like "it's not a real SCM, but maybe someone could build one on top of it someday" or something like that, but I cannot figure out how to find that.

You _can_ see, though, that in his first README, he refers to what he's building as not a "real SCM":

https://github.com/git/git/commit/e83c5163316f89bfbde7d9ab23...

Here is the direct link, as HN somehow removes the query string: https://github.com/git/git/commits?author=peff&since=2023-10...

I understand all that.

I'm saying, if you write a survey and one of the possible answers is "diff", but you don't clearly define what you mean by "diff", then don't be surprised if respondents use any reasonable definition that makes sense to them. Ask an ambiguous question, get a mishmash of answers.

The thing that Git uses for packfiles is called a "delta" by Git, but it's also reasonable to call it a "diff". After all, Git's delta algorithm is "greatly inspired by parts of LibXDiff from Davide Libenzi"[1]. Not LibXDelta but LibXDiff.

Yes, how Git stores blobs (using deltas) is orthogonal to how Git uses blobs. But while that orthogonality is useful for reasoning about Git, it's not wrong to think of a commit as the totality of what Git does, including that optimization. (Some people, when learning Git, stumble over the way it's described as storing full copies, think it's wasteful. For them to wrap their heads around Git, they have to understand that the optimization exists. Which makes sense because Git probably wouldn't be practical if it lacked that optimization.)

The reason I'm bringing all this up is, if you're trying to explain Git, which is what the original article is about, then it's very important to keep in mind that someone who is learning Git needs to know what you mean when you say "diff". Most people who already know Git would tend to gravitate toward the definition of "diff" that you're assuming (the thing that Git computes on the fly and never stores), but people who already know Git aren't the target audience when you're teaching Git.

---

[1] https://github.com/git/git/blob/master/diff-delta.c

Didn't Git have a new default merge strategy, `ort` https://github.com/git/git/blob/master/Documentation/RelNote... ?

Yes, but you are referring to standalone scripts, not functions defined within a Bash script.

Compare for example the following helper code used for git command completion inside Bash and inside PowerShell.

Bash: https://github.com/git/git/blob/master/contrib/completion/gi...

IntelliJ: https://www.jetbrains.com/help/idea/investigate-changes.html

VSCode:

https://marketplace.visualstudio.com/items?itemName=mhutchie...

or https://github.com/gitkraken/vscode-gitlens#commit-graph-

SourceTree: https://confluence.atlassian.com/sourcetreekb/viewing-log-hi...

Quite a while ago, the GitLens+ plugin gained the Commit Graph feature--the same graph you see in GitKraken. Until then I had used Git Graph for visualizing my repositories and GitLens+ for git blame in the GUI. Since one plugin could now do both, the natural course of action was to remove the other--goodbye, Git Graph!

Btw, today I want to speak about something different, I love git and I love terminal, but sometimes I love having the info visualised appealingly and get info about the source control quickly. I work with VsCode typically, so some months ago I tried to find a solution for this editor that resolves what was said before. After googling and some testing, the result of my search was: GitLens. Now, I want to show you how it works and how it can improve your routine. So don't waste time and let's jump in it!

GitLens extension chef's kiss

for GitLens https://gitlens.amod.io/

The better version is to have something like gitlens installed into your IDE and have it dynamically render those git comments.

https://github.com/Axosoft/vscode-gitlens#current-line-blame...

I learned the cli first, but I do use vscode's git integration for staging and committing. I also love gitlens's "commits by file / line" feature.

Hi. Vs code is pretty well integrated with git. There are built in git support and a couple other plugins. For example, the most popular git plugin for vs code is git lens. It also has powerful rebase editor (i guess, it is my favorite feature), which you can enable by following this guide. I personally realy enjoing Git Graph extension, which allow you to observe your git history in pretty similar to git kraken way. It also provide navigation facilities and some other useful features.