@b0rk I got a little confused by the output of git diff - what did it mean by diff --git? Is there a real --git option for the git CLI? And what was the a/path/to/file b/path/to/file stuff about? I figured it out pretty quickly, but still.
I'd add whatchanged and shortlog in the history section. I'm using the first if I want to see what files have been touched and the second when I'm interested in the distribution of contributions across committers 🤓
@b0rk Hmm, the categorization is a bit confusing to me. Both the grouping, as well as some terms (e.g. ".git/config" is a thing or a file, but less so a term from git jargon).
But in general some jargon I'm missing but hear often when talking about git:
@b0rk I didn't see rev-list and rev-parse. Not too familiar with them, but they are part of a couple of commands that I use in some automation scripts. current_branch=$(git rev-parse --abbrev-ref HEAD), and commits_ahead=$(git rev-list --left-right --count main...origin/main | perl -lae 'print $F[0]')
@b0rk Nice! I think I would add “rerere” under merging just because the name is so silly that everyone will want to figure out what it is once they hear it 😄
Also maybe “switch” for branches and move “restore” to staging area?
Add comment