feat: minor work tweaks
This commit is contained in:
parent
db41615adf
commit
16247e2a61
@ -9,14 +9,25 @@
|
|||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
|
|
||||||
[interactive]
|
[interactive]
|
||||||
diffFilter = delta --color-only
|
diffFilter = delta --color-only
|
||||||
|
|
||||||
[delta]
|
[delta]
|
||||||
navigate = true # use n and N to move between diff sections
|
navigate = true
|
||||||
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
|
dark = true
|
||||||
|
|
||||||
[merge]
|
[merge]
|
||||||
conflictstyle = diff3
|
conflictstyle = zdiff3
|
||||||
|
|
||||||
[diff]
|
[diff]
|
||||||
colorMoved = default
|
algorithm = histogram
|
||||||
|
colorMoved = default
|
||||||
|
mnemonicPrefix = true
|
||||||
|
renames = true
|
||||||
|
|
||||||
|
[init]
|
||||||
|
defaultBranch = master
|
||||||
|
|
||||||
|
[fetch]
|
||||||
|
prune = true
|
||||||
|
pruneTags = true
|
||||||
|
all = true
|
||||||
|
@ -28,6 +28,7 @@ alias gr='git reset'
|
|||||||
alias grm='git rm'
|
alias grm='git rm'
|
||||||
|
|
||||||
alias lg='lazygit'
|
alias lg='lazygit'
|
||||||
|
alias fxc='xclip -o -selection clipboard | fx'
|
||||||
|
|
||||||
# starting ssh-agent
|
# starting ssh-agent
|
||||||
if [ -z "$SSH_AUTH_SOCK" ] ; then
|
if [ -z "$SSH_AUTH_SOCK" ] ; then
|
||||||
|
Loading…
Reference in New Issue
Block a user