mirror of
https://github.com/d0zingcat/dotfiles.git
synced 2026-05-13 23:16:44 +00:00
Li Tang
c0a19555c1
Improve shell and setup resilience, clean package definitions, and remove the hardcoded Alacritty startup directory so the dotfiles behave more predictably across machines.
73 lines
2.4 KiB
Plaintext
73 lines
2.4 KiB
Plaintext
[init]
|
|
defaultBranch = main
|
|
|
|
[user]
|
|
name = Li Tang
|
|
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPaVruhhL4O9BiAncnW1wH3jc7/hsqsXLknA8Xtnjjee
|
|
email = iamtangli42@gmail.com
|
|
|
|
[commit]
|
|
gpgsign = true
|
|
|
|
[gpg]
|
|
format = ssh
|
|
|
|
[gpg "ssh"]
|
|
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
|
|
|
|
[url "https://"]
|
|
insteadOf = git://
|
|
|
|
[core]
|
|
editor = nvim
|
|
excludesfile = /Users/d0zingcat/.config/git/.gitignore
|
|
|
|
[pager]
|
|
difftool = true
|
|
|
|
#[diff]
|
|
# external = difft
|
|
# tool = difftastic
|
|
#
|
|
#[difftool]
|
|
# prompt = false
|
|
#
|
|
#[difftool "difftastic"]
|
|
# prompt = false
|
|
# cmd = difft "$LOCAL" "$REMOTE"
|
|
|
|
[alias]
|
|
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
|
pr = pull --rebase origin
|
|
unstage = reset HEAD --
|
|
p = push
|
|
st = status
|
|
co = checkout
|
|
cb = checkout -b
|
|
br = branch
|
|
cm = commit -s -m
|
|
ca = commit --amend -s --no-edit
|
|
d = diff
|
|
ds = diff --staged
|
|
dc = diff --cached
|
|
detect-placeholder-config = "!bash -lc 'CONFIG_FILE=$(git rev-parse --show-toplevel 2>/dev/null || echo \".\")/git/config; if [ -f \"$HOME/.dotfiles/git/config\" ]; then CONFIG_FILE=\"$HOME/.dotfiles/git/config\"; fi; if [ -f \"$CONFIG_FILE\" ]; then if grep -qE \"name\\s*=\\s*YOUR_NAME|email\\s*=\\s*YOUR_EMAIL|signingkey\\s*=\\s*YOUR_SSH_SIGNING_KEY\" \"$CONFIG_FILE\"; then echo \"[config] WARNING: Placeholder values detected in $CONFIG_FILE\"; echo \"[config] Please run: git config --file $CONFIG_FILE user.name 'Your Name'; git config --file $CONFIG_FILE user.email 'your@email.com'; git config --file $CONFIG_FILE user.signingkey 'your-ssh-key'\"; else echo \"[config] Git config looks good - no placeholders detected\"; fi; else echo \"[config] Config file not found: $CONFIG_FILE\"; fi'"
|
|
|
|
#[difftool "sourcetree"]
|
|
# cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
# path =
|
|
#
|
|
#[mergetool "sourcetree"]
|
|
# cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
|
# trustExitCode = true
|
|
[difftool "sourcetree"]
|
|
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
path =
|
|
[mergetool "sourcetree"]
|
|
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
|
trustExitCode = true
|
|
[filter "lfs"]
|
|
process = git-lfs filter-process
|
|
required = true
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|