X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=83f1bee08ceccdc61ab4232747a6539ff210b55f;hb=50e5d822ebe0c7bd41cafddc120ce31480494703;hp=cd86ef36705e6613436c74fb49d89a1f75b91423;hpb=ad68d4cd34f1114257c53e3354c2de01ef26b518;p=dotfiles.git diff --git a/.gitconfig b/.gitconfig index cd86ef3..83f1bee 100644 --- a/.gitconfig +++ b/.gitconfig @@ -12,6 +12,54 @@ [pretty] beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n +[color] + ui = auto + +[color "branch"] +# -- default -- +# current = green +# local = normal +# plain = normal +# remote = red +# -- light bg -- + current = blue + remote = magenta +[color "diff"] +# -- default -- +# commit = yellow +# frag = cyan +# meta = bold +# new = green +# old = red +# plain = normal +# whitespace = normal red +# -- light bg -- + commit = normal bold + frag = green + new = blue + old = magenta +#[color "grep"] +# -- default -- +# match = normal +#[color "interactive"] +# -- default -- +# error = normal +# header = normal +# help = normal +# prompt = normal +[color "status"] +# -- default -- +# added = red +# changed = red +# header = normal +# nobranch = red +# untracked = red +# updated = green +# -- light bg -- + added = blue + changed = blue + updated = magenta + [core] pager = less -FRSXgimq @@ -23,6 +71,9 @@ # 3 way diffs # cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\" +[receive] + denyNonFastForwards = true + [web] browser = webbrowser