mirror of
https://github.com/CompeyDev/dotfiles.git
synced 2024-12-12 12:50:36 +00:00
feat: sane git diff & other aliases
This commit is contained in:
parent
3bf44ae13a
commit
649834c839
2 changed files with 20 additions and 0 deletions
2
.bashrc
2
.bashrc
|
@ -21,6 +21,8 @@ alias ls='ls --color=auto'
|
||||||
alias neofetch="neofetch | lolcat"
|
alias neofetch="neofetch | lolcat"
|
||||||
alias pokete="pokete.py"
|
alias pokete="pokete.py"
|
||||||
alias cat="bat"
|
alias cat="bat"
|
||||||
|
alias ls="lsd"
|
||||||
|
|
||||||
|
|
||||||
# Path & Binaries
|
# Path & Binaries
|
||||||
export GOPATH=~/sdk/go1.19.4/
|
export GOPATH=~/sdk/go1.19.4/
|
||||||
|
|
18
.gitconfig
18
.gitconfig
|
@ -12,14 +12,32 @@
|
||||||
signingkey = 23CD97ABBBCC5ED2
|
signingkey = 23CD97ABBBCC5ED2
|
||||||
email = hi@devcomp.xyz
|
email = hi@devcomp.xyz
|
||||||
name = CompeyDev
|
name = CompeyDev
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
|
||||||
[filter "lfs"]
|
[filter "lfs"]
|
||||||
clean = git-lfs clean -- %f
|
clean = git-lfs clean -- %f
|
||||||
smudge = git-lfs smudge -- %f
|
smudge = git-lfs smudge -- %f
|
||||||
process = git-lfs filter-process
|
process = git-lfs filter-process
|
||||||
required = true
|
required = true
|
||||||
|
|
||||||
[gpg]
|
[gpg]
|
||||||
program = gpg
|
program = gpg
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
autocrlf = false
|
autocrlf = false
|
||||||
|
pager = delta
|
||||||
|
|
||||||
|
[interactive]
|
||||||
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
|
[delta]
|
||||||
|
navigate = true # use n and N to move between diff sections
|
||||||
|
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
|
||||||
|
|
||||||
|
[merge]
|
||||||
|
conflictstyle = diff3
|
||||||
|
|
||||||
|
[diff]
|
||||||
|
colorMoved = default
|
||||||
|
|
Loading…
Reference in a new issue