Config: ~/.config/git/config (tracked), with the commit template and global ignore next
to it. Colours for git and for delta, which renders
diffs, come from the desktop theme (~/.local/state/desktop/theme/git.conf).
Identity and anything machine-specific ([user], credential.helper, internal hosts) go
in the untracked ~/.config/git/local.gitconfig; git works before it exists.
pull.rebase,rebase.autoStash,rerere,merge.conflictstyle = zdiff3push.autoSetupRemote: the firstgit pushsets the upstream- Short status with branch and stash; moved lines coloured in diffs
- Commit template lists the conventional types (
feat,fix,docs, …) - delta: line numbers;
n/Njump between files ingit diffandgit log -p