Update git config

master
Hektor Misplon 2023-05-04 23:58:11 +02:00
parent 82b6187cd6
commit 4eac165cb3
1 changed files with 5 additions and 0 deletions

View File

@ -11,6 +11,7 @@
d = diff d = diff
dc = diff --cached dc = diff --cached
a = add a = add
ap = add -p
cm = commit -m cm = commit -m
l = log --pretty=format:"(%an)\\ \\ %h\\ \\ %ad\\ \\ %s" --date=short l = log --pretty=format:"(%an)\\ \\ %h\\ \\ %ad\\ \\ %s" --date=short
s = status -s s = status -s
@ -58,3 +59,7 @@
[credential "https://github.com"] [credential "https://github.com"]
helper = !/usr/bin/gh auth git-credential helper = !/usr/bin/gh auth git-credential
[merge]
tool = vimdiff
conflictstyle = diff3