2019-04-08 19:20:30 +02:00
|
|
|
[user]
|
|
|
|
|
email = guillaume+github@dott.fr
|
|
|
|
|
name = Guillaume Dott
|
2012-11-08 14:54:46 +01:00
|
|
|
[color]
|
|
|
|
|
ui = auto
|
|
|
|
|
interactive = auto
|
2012-11-06 23:38:08 +01:00
|
|
|
[alias]
|
2013-02-08 11:19:14 +01:00
|
|
|
st = status -sb
|
2013-02-06 17:37:44 +01:00
|
|
|
ci = commit
|
|
|
|
|
co = checkout
|
|
|
|
|
pr = pull --rebase
|
2013-02-08 11:19:14 +01:00
|
|
|
dc = diff --cached
|
2013-02-21 17:17:09 +01:00
|
|
|
r = remote
|
2019-04-23 10:53:14 +02:00
|
|
|
lg = log --graph --pretty=tformat:'%C(red)%h%C(yellow)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%aN>%Creset' --abbrev-commit --date=human
|
2012-11-08 14:57:02 +01:00
|
|
|
ll = log --stat --abbrev-commit
|
2013-02-08 11:19:14 +01:00
|
|
|
amend = commit --amend -C HEAD
|
2014-07-07 14:47:00 +02:00
|
|
|
|
|
|
|
|
s = stash
|
|
|
|
|
sl = stash list
|
|
|
|
|
ss = stash show
|
2012-11-08 15:08:01 +01:00
|
|
|
[diff]
|
|
|
|
|
tool = vimdiff
|
|
|
|
|
[merge]
|
2017-07-27 09:51:28 +02:00
|
|
|
tool = vimdiff
|
|
|
|
|
conflictstyle = diff3
|
2013-10-22 17:07:42 +02:00
|
|
|
[mergetool]
|
|
|
|
|
keepBackup = false
|
2013-06-18 16:30:12 +02:00
|
|
|
[credential]
|
|
|
|
|
helper = cache
|
2014-07-07 14:47:00 +02:00
|
|
|
[help]
|
|
|
|
|
autocorrect = -1
|
|
|
|
|
[rerere]
|
|
|
|
|
enabled = true
|
2015-06-15 13:23:07 +02:00
|
|
|
[rebase]
|
|
|
|
|
autosquash = true
|
2017-08-18 09:41:59 +02:00
|
|
|
autostassh = true
|
2012-11-07 11:50:31 +01:00
|
|
|
# vim: set filetype=gitconfig:
|
2021-03-12 11:47:15 +01:00
|
|
|
[pull]
|
|
|
|
|
rebase = true
|
2021-07-08 21:05:50 +02:00
|
|
|
[init]
|
|
|
|
|
defaultBranch = main
|
