Skip to content

Instantly share code, notes, and snippets.

@oren-l
Created June 10, 2025 08:30
Show Gist options
  • Select an option

  • Save oren-l/44540562cf8fd949150578f97325b6d0 to your computer and use it in GitHub Desktop.

Select an option

Save oren-l/44540562cf8fd949150578f97325b6d0 to your computer and use it in GitHub Desktop.
git config using diff-so-fancy
[user]
# name = Your Name
# email = [email protected]
[branch]
sort = -committerdate
[init]
defaultBranch = main
autoSetupRemote = true
[core]
editor = code --wait
pager = diff-so-fancy | less --tabs=4 -RF
[push]
default = simple
[fetch]
prune = true
pruneTags = true
all = true
[pull]
rebase = true
[color "branch"]
current = yellow bold
local = green bold
remote = cyan bold
[color "diff"]
meta = 11
frag = magenta bold
old = red bold
new = green bold
whitespace = red reverse
func = 146 bold
commit = yellow bold
[color "status"]
added = green bold
changed = yellow bold
untracked = red bold
[help]
autocorrect = prompt
[commit]
verbose = true
[rerere]
enabled = true
autoupdate = true
[alias]
st = status
co = checkout
br = branch
ci = commit
hist = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
dfw = diff -b -w --ignore-space-at-eol
pushf = push --force-with-lease
compb = show-branch @
rehist = hist ORIG_HEAD..
# difftool
[diff]
tool = vscode
algorithm = histogram
colorMoved = plain
mnemonicPrefix = true
renames = true
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[merge]
ff = false
tool = vscode
conflictstyle = zdiff3
[mergetool "vscode"]
cmd = code --wait $MERGED
[tag]
sort = version:refname
[interactive]
diffFilter = diff-so-fancy --patch
[color]
ui = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[diff-so-fancy]
stripLeadingSymbols = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment