feat(git): add gitconfig

This commit is contained in:
Saibotk 2024-04-02 23:40:18 +02:00
parent 3cbc6318bc
commit d00d50015e
Signed by: saibotk
GPG key ID: 67585F0065E261D5
2 changed files with 59 additions and 0 deletions

48
.gitconfig Normal file
View file

@ -0,0 +1,48 @@
[user]
email = git@saibotk.de
name = Saibotk
signingKey = D6D71F8629D98610A9EED6917688BE2AC0E0113D
[gpg]
program = gpg
[commit]
gpgSign = true
[tag]
forceSignAnnotated = true
sort = taggerdate
[diff]
algorithm = histogram
submodule = log
[alias]
append = town append
diff-parent = town diff-parent
hack = town hack
kill = town kill
prepend = town prepend
propose = town propose
rename-branch = town rename-branch
repo = town repo
ship = town ship
sync = town sync
pr = town
[git-town]
sync-feature-strategy = rebase
[blame]
ignoreRevsFile = .git-blame-ignore-revs
[rerere]
enabled = true
[merge]
conflictstyle = zdiff3
[rebase]
autosquash = true
[core]
pager = delta
[submodule]
recurse = true
[status]
submoduleSummary = true
[branch]
sort = -committerdate
[url "git@github.com:"]
insteadOf = "https://github.com/"
[push]
autoSetupRemote = true

View file

@ -16,6 +16,17 @@ rm -rf $HOME/.zshrc
ln -s $DOTFILES/zsh/.zshrc $HOME/.zshrc
# Relink other software configs
# git
# We only include our config here to allow other tools to still modify the gitconfig locally with user specific paths etc.
# E.g. znap adds maintenance entries there.
echo """
[include]
path = ~/.dotfiles/.gitconfig
""" >> $HOME/.gitconfig
# tmux
rm -rf $HOME/.tmux.conf
ln -s $DOTFILES/.tmux.conf $HOME/.tmux.conf