chore: update and minify config
This commit is contained in:
parent
6efa74ea62
commit
f893a5d054
1634 changed files with 1974 additions and 281623 deletions
15
.gitconfig
15
.gitconfig
|
@ -3,7 +3,7 @@
|
|||
# My Linux .gitconfig #
|
||||
# #
|
||||
# Last revision: #
|
||||
# 2021-12-08 #
|
||||
# 2020-12-04 #
|
||||
# #
|
||||
###############################
|
||||
|
||||
|
@ -32,7 +32,7 @@
|
|||
# -- GIT for Windows has it's own vim
|
||||
# -- so it will run that instead.
|
||||
; Set the editor to be used by GIT
|
||||
editor = nvim
|
||||
editor = ~/.local/bin/lvim
|
||||
|
||||
; Custom .gitignore
|
||||
excludesfile = ~/.gitignore
|
||||
|
@ -63,14 +63,14 @@
|
|||
prompt = true
|
||||
|
||||
[difftool "nvimdiff"]
|
||||
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
|
||||
cmd = "~/.local/bin/lvim -d \"$LOCAL\" \"$REMOTE\""
|
||||
|
||||
[merge]
|
||||
# Your path might be different, but unlikely
|
||||
# -- this needs to manually be set because
|
||||
# -- GIT for Windows has it's own vim
|
||||
# -- so it will run that instead.
|
||||
tool = nvimdiff
|
||||
tool = edit -d
|
||||
|
||||
; https://git-scm.com/docs/git-merge#_how_conflicts_are_presented
|
||||
conflictstyle = diff3
|
||||
|
@ -88,8 +88,11 @@
|
|||
|
||||
[user]
|
||||
name = Alexandre Cavalheiro S. Tiago da Silva
|
||||
email = <email>
|
||||
signingkey = <key>
|
||||
email = contact@thewizard.link
|
||||
signingkey = A1D3A2B4E14BD7C0445BB749A5767B54367CFBDF
|
||||
|
||||
[pull]
|
||||
ff = only
|
||||
|
||||
[init]
|
||||
defaultBranch = main
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue