I pretty much exclusively use git with aliases, all of which are g followed by two letters: https://bin.sebsite.pw/082h

It definitely depends on how used to git without aliases you are. I started using aliases from the very beginning so these are all part of my muscle memory, but it’s definitely not something I’d recommend to someone who’s already comfortable using git. Or at the very least, the aliases should be created incrementally for commands that you find yourself using frequently, not memorized all at once.

This post made me look up how to import history into atuin (tldr - zsh history is just a flat file of commands with no additional metadata which can be found at $HISTFILE). I would rather have atuin fuzzy find the full, verbose (readable) command rather than attempt to remember the alias.

Magit is definitely a better TUI/GUI.

Similar. I use fish, which makes it so easy to repeat a command from history that shortening it is pointless: I type “push↑” (that’s an up arrow), and fish finds it from history in its glorious canonical form, which is how I use it:

git push --force-with-lease origin HEAD~N:refs/heads/(whatever)

Here, I do use the shorthand whatever for git rev-parse --abbrev-ref HEAD, or whatever branch I’m on. The point is not so much to shorten, but to normalize history, so I can repeat it.

To me, my most used are:

• gsd='git status -s | cut -d " " -f 3 | xargs -I {} git stash push {} -m "{}"'

This takes everything that is currently staged or not and pushes into the stash with an appropriate message. What I’ve found annoying about stashing is that it by default uses the latest commit as the stash title instead of the far more descriptive file name.

• gd='git diff --color-words'

I’ve found this to be a far better diffing experience than the regular diff as when a single word changes within a line it shows it much more clearly. Same for staged changes: gds='git diff --staged --color-words'

• gdog="git log --pretty=format:'%C(auto)%h %C(blue) %<|(20) %aI %C(auto) %d %s' --graph --all --decorate"

A very clean history with just the short SHA, date, and message with the reference.

function diff_stash() {
  # $1 - item number from 'git stash list'

  local item="$1"

  git stash show -p stash@{"$item"}
}

This allows me to show what is in the stash based on the index.

function gdogtag() {
  git log \
    --pretty=format:'%C(auto)%h %C(blue) %<|(20) %aI %C(auto) %d %s' \
    --graph \
    --decorate \
    "$(test -d "${PWD}/.git" && git describe --tags --abbrev=0 @^)..@"
}

Shows me the commits between the current state and the previous tag.