57 lines
1.0 KiB
Plaintext
57 lines
1.0 KiB
Plaintext
[user]
|
|
email = guillaume+github@dott.fr
|
|
name = Guillaume Dott
|
|
[color]
|
|
ui = auto
|
|
interactive = auto
|
|
[alias]
|
|
st = status -sb
|
|
ci = commit
|
|
co = checkout
|
|
pr = pull --rebase
|
|
dc = diff --cached
|
|
r = remote
|
|
lg = log --graph --pretty=tformat:'%C(red)%h%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%aN>%Creset' --abbrev-commit --date=human
|
|
ll = log --stat --abbrev-commit
|
|
amend = commit --amend -C HEAD
|
|
|
|
s = stash
|
|
sl = stash list
|
|
ss = stash show
|
|
deploy = !git checkout production && git merge --ff-only origin/develop
|
|
[diff]
|
|
tool = vimdiff
|
|
[merge]
|
|
tool = vimdiff
|
|
conflictstyle = diff3
|
|
[mergetool]
|
|
keepBackup = false
|
|
[credential]
|
|
helper = cache
|
|
[help]
|
|
autocorrect = prompt
|
|
[rerere]
|
|
enabled = true
|
|
autoupdate = true
|
|
[rebase]
|
|
autoSquash = true
|
|
autoStash = true
|
|
updateRefs = true
|
|
# vim: set filetype=gitconfig:
|
|
[pull]
|
|
rebase = true
|
|
[init]
|
|
defaultBranch = main
|
|
[diff "ansible-vault"]
|
|
textconv = ansible-vault view
|
|
[column]
|
|
ui = auto
|
|
[branch]
|
|
sort = -committerdate
|
|
[tag]
|
|
sort = version:refname
|
|
[fetch]
|
|
prune = true
|
|
pruneTags = true
|
|
all = true
|