mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
29 lines
921 B
Plaintext
29 lines
921 B
Plaintext
# See https://git-scm.com/docs/git-config
|
|
|
|
[alias]
|
|
co = checkout
|
|
br = branch
|
|
ci = commit
|
|
st = status
|
|
[init]
|
|
defaultBranch = master
|
|
[pull]
|
|
rebase = true # Rebase (instead of merge) on pull
|
|
[push]
|
|
autoSetupRemote = true # Automatically set upstream branch on push
|
|
[diff]
|
|
algorithm = histogram # Clearer diffs on moved/edited lines
|
|
colorMoved = plain # Highlight moved blocks in diffs
|
|
mnemonicPrefix = true # More intuitive refs in diff output
|
|
[commit]
|
|
verbose = true # Include diff comment in commit message template
|
|
[column]
|
|
ui = auto # Output in columns when possible
|
|
[branch]
|
|
sort = -committerdate # Sort branches by most recent commit first
|
|
[tag]
|
|
sort = -version:refname # Sort version numbers as you would expect
|
|
[rerere]
|
|
enabled = true # Record and reuse conflict resolutions
|
|
autoupdate = true # Apply stored conflict resolutions automatically
|