summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEkaitz Zarraga <ekaitz@elenq.tech>2024-05-19 01:03:00 +0200
committerEkaitz Zarraga <ekaitz@elenq.tech>2024-05-19 01:03:00 +0200
commitf39dafe6c9cb686265fe8c96ae47067d30f71881 (patch)
tree3c80ed44bc1cc8abacf58339d70abca0dd3e5ba4
parentf567a8cd2f3243f9506ae63c6b06ce74795829bf (diff)
git: update config with aliases and sendemail
-rw-r--r--git/dot-gitconfig35
1 files changed, 23 insertions, 12 deletions
diff --git a/git/dot-gitconfig b/git/dot-gitconfig
index 1827554..0456bf1 100644
--- a/git/dot-gitconfig
+++ b/git/dot-gitconfig
@@ -1,21 +1,32 @@
[user]
- email = ekaitz@elenq.tech
- name = Ekaitz Zarraga
+ email = ekaitz@elenq.tech
+ name = Ekaitz Zarraga
[core]
- editor = nvim
+ editor = nvim
[color]
- ui = auto
+ ui = auto
[diff]
- tool = nvimdiff
+ tool = nvimdiff
[merge]
- tool = nvimdiff
- conflictStyle = diff3
+ tool = nvimdiff
+ conflictStyle = diff3
[push]
- default = simple
+ default = simple
[alias]
- lg = log --graph --oneline --decorate --all
- overview = log --graph --oneline --decorate --all --simplify-by-decoration
+ lg = log --graph --oneline --decorate
+ lga = log --graph --oneline --decorate --all
+ overview = log --graph --oneline --decorate --all --simplify-by-decoration
[pull]
- ff = only
+ ff = only
[init]
- defaultBranch = master
+ defaultBranch = master
+[branch]
+ sort = -committerdate
+[sendemail]
+ smtpserver = smtp.soverin.net
+ smtpuser = ekaitz@elenq.tech
+ smtpencryption = ssl
+ annotate = true
+ confirm = auto
+[rebase]
+ autosquash = true