[skrebbel]

That’s totally the same thing, they’re about what to do with the staging area but using 2 words for it (index and cache). The third term is “staging area” or the flag --staged for other commands.

Any sane tool uses one word for each concept, not three. The Git CLI is full of this sort of shit and it drives me mad.

[1718627440]

The term "staging area" doesn't originate from Git itself, it was coined by third-parties. The single term you are looking for is index, it used to be cache, but was renamed long ago, and now cache only remains as a verb in some places.

[skrebbel]

It wasn’t renamed. If it was renamed they’d have deprecated --cached and introduced a new flag with a proper name.

Also why does “git restore --staged” exist if the term “staging area” isn’t from Git? And why does “git add -i” have the words “staged” and “unstaged” all over the output?

The answer to all these questions is that Git is made by people who care very deeply about data structures and very little about users. Git is needlessly difficult and this is just one of the many places where it shows.

Don’t get me wrong, I’d much rather use a VCS with good data structures than one with good naming. Git is popular for a reason. But the bad CLI design is just such a waste because it makes Git needlessly hard to learn to the benefit of absolutely nothing. It’s not a tradeoff. It’s just shitty.

[skrebbel]

lol turns out I misremember and it's "git stash --staged", the --cached parameter doesn't exist and my moist LLM hallucinated it. I've used Git for 15 years every day and I still don't know the basic commands.