[user] name = François Gannaz email = francois.gannaz@silecs.info [color] branch = auto diff = auto interactive = auto status = auto ui = auto [alias] co = checkout ci = commit st = status -sb hist = log --pretty=format:\"%Cred%h%Creset %C(green bold)%ad%Creset [%an] %C(blue bold)%d%Creset %s\" --graph --date=short rollback = reset --mixed "HEAD~1" in = "!git remote update; git log --pretty=format:'%Cred%h%Creset %C(green bold)%ad%Creset [%an]%C(blue bold)%d%Creset %s' --date=short '..@{u}'" out = log --pretty=format:\"%Cred%h%Creset %C(green bold)%ad%Creset%C(blue bold)%d%Creset %s\" --date=short @{u}.. rebaseout = rebase -i @{u} bl = blame -wMC logv = log --pretty=format:\"%C(yellow)%h %C(green bold)%ad%C(red)%d %C(reset)%s%C(green) [%cn]\" --decorate --date=short --numstat [core] pager = less -FSRX --tabs=4 attributesfile = ~/.gitattributes [commit] cleanup = scissors [pager] log = diff-highlight | less -FSRX --tabs=4 show = diff-highlight | less -FSRX --tabs=4 diff = diff-highlight | less -FSRX --tabs=4 [merge] conflictstyle = diff3 [rerere] enabled = 1 [push] default = simple