zc-workstationDocumentation PDF GitHub

git, delta, difftastic and git-absorb

git and its helpers: delta diffs, structural diffs, automatic fixups and secret scanning.

.md

The workstation installs a current git and a few helpers that make it easier to read and to keep clean.

On the workstation

  • git from Homebrew, newer than the one Xcode ships.

  • delta shows diffs side by side with syntax highlighting, in git and lazygit; assets/theme/dot_config/git/zoolcoder-delta.gitconfig holds its colours.

  • difftastic compares by syntax, not by lines (git dft).

  • git-absorb turns staged changes into fixup commits for the commits they belong to.

  • Global git hooks run a gitleaks scan before every commit, then the repository’s own hook.

  • git maintenance runs in the background on the repositories you use.

Keys and commands

Key or command Does

gs gd gds glog

status, diff, staged diff, the last 20 commits as a graph

git dft

A structural diff

git absorb

Create fixup commits for what is staged

Edit this page Last updated

Keyboard shortcuts

Ctrl/⌘ K or /
Search the docs
↑ ↓ Enter
Move through the search results
← →
Previous or next page
f
Filter the pages in the sidebar
g h
Home
t
Cycle the theme
?
This list
Esc
Close a menu or the search results