dotfiles/home/.config/git/config, branch masterMy linux config and rc files
https://git.strisemarx.com/dotfiles/atom?h=master2026-04-17T09:53:37Zchore: clean up gitignore, extend mergiraf, add colorMovedWS2026-04-17T09:53:37Zsommerfeldsommerfeld@sommerfeld.dev2026-04-17T09:53:37Zurn:sha1:087b393f1a1d787b88c3fcab7e400f70c6be2c50
- gitignore: remove redundant */node_modules/ (node_modules/ already
matches at any depth), consolidate clangd cache pattern to **/
- attributes: add .tsx and .lua to mergiraf merge driver
- config: add diff.colorMovedWS = allow-indentation-change to
complement colorMoved, ignoring whitespace in moved blocks
refactor: clean up git aliases2026-04-17T09:53:37Zsommerfeldsommerfeld@sommerfeld.dev2026-04-17T09:53:37Zurn:sha1:6a448daf5fedff456d1be5b0e58ada5dbe12d637
- Remove 'stage = add' — redundant with 'a = add'.
- Add 'cp = cherry-pick' — common operation without a shortcut.
- Add 'lg = log --graph --oneline' — visual branch graph.
refactor: improve safety of autocorrect and remove undo alias2026-04-17T09:53:36Zsommerfeldsommerfeld@sommerfeld.dev2026-04-17T09:53:36Zurn:sha1:118d166419760939d0784bed66efea7c42a16157
- Change help.autocorrect from 1 (0.1s auto-execute) to 'prompt'
(asks before executing the guessed command). Prevents accidental
execution of wrong commands.
- Remove 'undo = reset --hard' alias — destructive with no
confirmation, could silently discard uncommitted work.
feat: add modern git options2026-04-17T09:53:36Zsommerfeldsommerfeld@sommerfeld.dev2026-04-17T09:53:36Zurn:sha1:bb1870cf4c48519e736f9e3f4aecb6ac4c68037e
- rebase.updateRefs = true: auto-update dependent branches when
rebasing a stack. Essential for stacked branch workflows.
- rerere.enabled = true: remember conflict resolutions and auto-apply
them when the same conflict is encountered again.
- column.ui = auto: display branches and tags in columns instead of
a long vertical list.
chore: remove unnecessary core.autocrlf on Linux2026-04-17T09:53:35Zsommerfeldsommerfeld@sommerfeld.dev2026-04-17T09:53:35Zurn:sha1:dd3f4dddc7c4b0e39c8a784085ddaafe2787ccbd
core.autocrlf = input does nothing on a Linux-only system — no files
will have CRLF line endings natively. The modern approach for
cross-platform repos is per-repo .gitattributes.
fix: remove invalid whitespace value and enable histogram diff2026-04-17T09:53:35Zsommerfeldsommerfeld@sommerfeld.dev2026-04-17T09:53:35Zurn:sha1:fb8a35261c0b8f937894b6df9c467cf6bb3d86c8
- Remove 'fix' from core.whitespace — it's an apply.whitespace action,
not a valid whitespace type. Was silently ignored.
- Uncomment diff.algorithm = histogram — produces better diffs than
the default myers algorithm, especially for moved code blocks.
git: add fmt alias2026-04-11T14:59:02Zsommerfeldsommerfeld@sommerfeld.dev2026-04-11T14:59:02Zurn:sha1:c9819e76c4e526f733b3d3cd1b695a6bd548c611git: Improve defaults and aliases2025-10-24T10:48:00Zsommerfeldsommerfeld@sommerfeld.dev2025-10-24T10:48:00Zurn:sha1:638c4599ddc3ddeac7a2c3973626bbd048240aeaAdd a lot of changes2025-09-11T15:38:11Zsommerfeldsommerfeld@sommerfeld.dev2025-09-11T15:38:11Zurn:sha1:aa62e1f27b0cb3d712d6f2b13071cca0f09379be[git] Change work directory2025-01-31T17:56:06Zsommerfeldsommerfeld@sommerfeld.dev2025-01-31T17:32:58Zurn:sha1:fe66698447f15f4028d89e3f02793fc024126e60