aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/home/.config/git
Commit message (Collapse)AuthorAgeFilesLines
* chore: clean up gitignore, extend mergiraf, add colorMovedWSLibravatar sommerfeld38 hours3-6/+8
| | | | | | | | - 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 aliasesLibravatar sommerfeld38 hours1-1/+2
| | | | | | - 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 aliasLibravatar sommerfeld38 hours1-3/+4
| | | | | | | | - 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 optionsLibravatar sommerfeld38 hours1-0/+5
| | | | | | | | | - 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 LinuxLibravatar sommerfeld38 hours1-1/+0
| | | | | | 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 diffLibravatar sommerfeld38 hours1-2/+2
| | | | | | | - 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: only ignore comp DBs at the repo rootLibravatar sommerfeld7 days1-2/+2
|
* git: add fmt aliasLibravatar sommerfeld7 days1-0/+1
|
* git: Improve defaults and aliasesLibravatar sommerfeld2025-10-241-41/+34
|
* Add a lot of changesLibravatar sommerfeld2025-09-112-564/+26
|
* [git] Add node_modules to gitignoreLibravatar sommerfeld2025-01-311-0/+2
|
* [git] Change work directoryLibravatar sommerfeld2025-01-311-0/+1
|
* Set git's mergeTool.keepTemporaries=falseLibravatar sommerfeld2025-01-311-0/+2
|
* Improve delta configLibravatar sommerfeld2025-01-311-1/+5
|
* Add difftastic configLibravatar sommerfeld2025-01-311-1/+8
|
* Add mergirafLibravatar sommerfeld2025-01-312-1/+28
|
* Remove git noattributes fileLibravatar sommerfeld2025-01-311-389/+0
|
* [git] Add work conditional configLibravatar sommerfeld2024-05-221-0/+4
|
* [git] Removed unused config linesLibravatar sommerfeld2024-05-221-8/+0
|
* [git] Sign tags as wellLibravatar sommerfeld2024-05-161-0/+2
|
* [git] set push.followTagsLibravatar sommerfeld2024-05-161-1/+1
|
* Update main gpg keyLibravatar sommerfeld2024-05-161-3/+3
|
* Remove autoMergeLibravatar Arnold Sommerfeld2023-11-171-1/+0
|
* Ignore .luarc.jsonLibravatar Arnold Sommerfeld2023-11-161-0/+1
|
* first commitLibravatar Arnold Sommerfeld2023-10-183-0/+1066