X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=701610db32b76078193d0c5241965cef3b2cfb0e;hb=4bbd4a68e6e0c4c3dac82b1962fb0bc649129479;hp=57f758903a8acba196e78423cedc272d232fca53;hpb=f46bd4d41cc7f243bc8a321effee5200aa69e709;p=dotfiles.git diff --git a/.gitconfig b/.gitconfig index 57f7589..701610d 100644 --- a/.gitconfig +++ b/.gitconfig @@ -5,7 +5,12 @@ co = checkout l1 = log --oneline l5 = log -5 - st = status + lb = log --decorate --graph --stat --pretty=beautiful + lb5 = log --decorate --graph --stat --pretty=beautiful -5 + st = status -s + +[pretty] + beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n [core] pager = less -FRSXgimq @@ -18,6 +23,9 @@ # 3 way diffs # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\" +[receive] + denyNonFastForwards = true + [web] browser = webbrowser