Skip to content

Commit

Permalink
Add git aliases and delta diff
Browse files Browse the repository at this point in the history
  • Loading branch information
RustyTake-Off committed Aug 9, 2024
1 parent b6a1b26 commit e96abe9
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions wslfiles/.gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
editor = vim
# https://blog.thomasheartman.com/posts/change-your-git-comment-character
# commentChar = ";"
pager = delta # delta

[branch]
sort = -committerdate
Expand All @@ -30,10 +31,14 @@
[diff]
# https://luppeng.wordpress.com/2020/10/10/when-to-use-each-of-the-git-diff-algorithms/
algorithm = histogram
colorMoved = default # delta

[init]
defaultBranch = main

[interactive]
diffFilter = delta --color-only # delta

[merge]
conflictStyle = diff3 # https://ductile.systems/zdiff3/ - zdiff3 brakes things for some reason

Expand All @@ -54,6 +59,10 @@
[tag]
sort = -taggerdate

[delta]
line-numbers = true
navigate = true

# Include separate gitconfigs
[includeIf "gitdir:~/pr/"]
path = ~/pr/pr.gitconfig
Expand All @@ -75,6 +84,11 @@
cl = clone
s = status --short

d = diff
ds = diff --stat
dc = diff --cached
dcs = diff --cached --stat

c = commit
cm = commit -m
ca = commit --amend
Expand Down

0 comments on commit e96abe9

Please sign in to comment.