mirror of https://tildegit.org/ben/dotfiles
reindent gitconfig
parent
fd399e7dfa
commit
4815662c48
|
@ -34,17 +34,18 @@
|
|||
smtpencryption = tls
|
||||
smtpserver = mail.tilde.team
|
||||
smtpserverport = 587
|
||||
annotate = yes
|
||||
smtpuser = ben
|
||||
annotate = yes
|
||||
[alias]
|
||||
lol = log --oneline --graph --decorate --all
|
||||
joke = !curl -s https://raw.githubusercontent.com/EugeneKay/git-jokes/lulz/Jokes.txt | shuf -n1
|
||||
dad = !curl https://icanhazdadjoke.com
|
||||
staged = diff --staged
|
||||
ap = add --patch
|
||||
cv = commit --verbose
|
||||
local = log --oneline --no-merges ${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}..HEAD
|
||||
upstream = log --oneline --no-merges HEAD..${1-$(git branch -lvv | perl -ne '/^\\\\*.*\\\\[(.*?)\\\\]/ and print \"$1\\n\"')}
|
||||
cv = commit --verbose
|
||||
|
||||
[rerere]
|
||||
enabled = true
|
||||
[merge]
|
||||
|
@ -52,12 +53,16 @@
|
|||
conflictstyle = diff3
|
||||
[mergetool]
|
||||
prompt = false
|
||||
|
||||
[core]
|
||||
pager = diff-highlight | less
|
||||
excludesfile = /home/ben/.gitignore
|
||||
|
||||
[url "git@salsa.debian.org:"]
|
||||
pushInsteadOf = https://salsa.debian.org/
|
||||
insteadOf = salsa:
|
||||
[url "git@bhh.sh:repos/"]
|
||||
pushInsteadOf = https://git.bhh.sh/
|
||||
|
||||
[init]
|
||||
defaultBranch = main
|
||||
|
|
Loading…
Reference in New Issue