benharri
/
dotfiles
mirror of https://tildegit.org/ben/dotfiles
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reindent gitconfig

master
Ben Harris 2022-08-10 15:11:27 -04:00
parent fd399e7dfa
commit 4815662c48
1 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
git/.gitconfig
View File

@ -1,17 +1,17 @@
[user] [user]
email = ben@tilde.team email = ben@tilde.team
name = Ben Harris name = Ben Harris
signingkey = FC2255B7BBC7EABD4EFAFA1068907D8BCCD85A5A signingkey = FC2255B7BBC7EABD4EFAFA1068907D8BCCD85A5A
[push] [push]
default = simple default = simple
[commit] [commit]
gpgsign = false gpgsign = false
verbose = true verbose = true
[pull] [pull]
ff = only ff = only
[pager] [pager]
diff = diff-highlight | less diff = diff-highlight | less
@ -23,41 +23,46 @@
colorMoved = default colorMoved = default
[diff "gpg"] [diff "gpg"]
textconv = gpg --no-tty --decrypt textconv = gpg --no-tty --decrypt
cachetextconv = false cachetextconv = false
[diff "ansible-vault"] [diff "ansible-vault"]
textconv = ansible-vault view textconv = ansible-vault view
cachetextconv = false cachetextconv = false
[sendemail] [sendemail]
smtpencryption = tls smtpencryption = tls
smtpserver = mail.tilde.team smtpserver = mail.tilde.team
smtpserverport = 587 smtpserverport = 587
annotate = yes smtpuser = ben
smtpuser = ben annotate = yes
[alias] [alias]
lol = log --oneline --graph --decorate --all lol = log --oneline --graph --decorate --all
joke = !curl -s https://raw.githubusercontent.com/EugeneKay/git-jokes/lulz/Jokes.txt | shuf -n1 joke = !curl -s https://raw.githubusercontent.com/EugeneKay/git-jokes/lulz/Jokes.txt | shuf -n1
dad = !curl https://icanhazdadjoke.com dad = !curl https://icanhazdadjoke.com
staged = diff --staged staged = diff --staged
ap = add --patch ap = add --patch
local = log --oneline --no-merges ${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}..HEAD cv = commit --verbose
upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')} local = log --oneline --no-merges ${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}..HEAD
cv = commit --verbose upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}
[rerere] [rerere]
enabled = true enabled = true
[merge] [merge]
tool = vimdiff tool = vimdiff
conflictstyle = diff3 conflictstyle = diff3
[mergetool] [mergetool]
prompt = false prompt = false
[core] [core]
excludesfile = /home/ben/.gitignore pager = diff-highlight | less
excludesfile = /home/ben/.gitignore
[url "git@salsa.debian.org:"] [url "git@salsa.debian.org:"]
pushInsteadOf = https://salsa.debian.org/ pushInsteadOf = https://salsa.debian.org/
insteadOf = salsa: insteadOf = salsa:
[url "git@bhh.sh:repos/"] [url "git@bhh.sh:repos/"]
pushInsteadOf = https://git.bhh.sh/ pushInsteadOf = https://git.bhh.sh/
[init] [init]
defaultBranch = main defaultBranch = main