thermokarst/dotfiles
1
0
Fork 0
Code Issues 3 Pull requests 1 Projects Wiki Activity Actions

git-delta

Browse source
This commit is contained in:
Matthew Ryan Dillon 2023-12-26 14:57:37 -05:00
parent 06e1032586
commit f1d046dbbb
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
home/dot_gitconfig
View file

@ -1,8 +1,24 @@
[include]
path = /opt/local/share/git-delta/themes.gitconfig
[user] [user]
name = Matthew Dillon name = Matthew Dillon
email = matthewrdillon@gmail.com email = matthewrdillon@gmail.com
[core] [core]
editor = hx editor = hx
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
features = chameleon
navigate = true
light = false
side-by-side = true
true-color = always
colorMoved = default
syntax-theme = base16
[diff]
colorMoved = default
[color] [color]
diff = auto diff = auto
status = auto status = auto
@ -13,12 +29,9 @@
auto = 1 auto = 1
[merge] [merge]
summary = true summary = true
tool = vimdiff
conflictstyle = diff3 conflictstyle = diff3
prompt = false prompt = false
[alias] [alias]
unstage = reset HEAD
uncommit = reset --soft HEAD^
# http://stackoverflow.com/a/9074343 # http://stackoverflow.com/a/9074343
lg1 = log \ lg1 = log \
--graph \ --graph \
@ -37,30 +50,15 @@
a = add a = add
c = commit --verbose c = commit --verbose
ca = commit -a --verbose ca = commit -a --verbose
m = commit --amend --verbose
d = diff d = diff
dc = diff --cached
s = status -s s = status -s
# TODO: drop when ready
# co = checkout
# cob = checkout -b
sw = switch sw = switch
swc = switch -c swc = switch -c
# list branches sorted by last modified # list branches sorted by last modified
b = "!git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's-refs/heads/--'" b = "!git for-each-ref --sort='-authordate' --format='%(authordate)%09%(objectname:short)%09%(refname)' refs/heads | sed -e 's-refs/heads/--'"
# list aliases # list aliases
la = "!git config -l | grep alias | cut -c 7-" la = "!git config -l | grep alias | cut -c 7-"
# [credential]
# helper = osxkeychain
[pull] [pull]
rebase = true rebase = true
[init] [init]
defaultBranch = main defaultBranch = main
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[safe]
directory = %(prefix)///wsl.localhost/Ubuntu/home/matthew/projects/personal/notes
directory = //wsl.localhost/Ubuntu/home/matthew/projects/personal/notes