From 454198a868b6fe5a6146376a9fdf063e1d0434cd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 15 Jan 2018 22:21:41 -0500 Subject: [PATCH] gitconfig: update Space out the sections as this file is getting big. Set core.pager to exit with short output for all commands. Newer git versions changed behavior with some subcommands. Add a pager section for diff-highlight for inline diffs. --- .gitconfig | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/.gitconfig b/.gitconfig index 1819dca..27f61cb 100644 --- a/.gitconfig +++ b/.gitconfig @@ -2,12 +2,16 @@ name = Mike Frysinger email = vapier@gentoo.org # signingkey = 0xE837F581 + [core] abbrev = 12 + pager = less -FRMX --tabs 4 -#10 + [color] ui = auto diff = auto status = auto + [color "diff"] old = red bold new = green bold @@ -15,10 +19,18 @@ frag = yellow bold whitespace = normal green meta = magenta + [diff] renames = true + +#[pager] +# diff = diff-highlight | less +# log = diff-highlight | less +# show = diff-highlight | less + [push] default = current + [alias] a = add ab = abandon @@ -55,20 +67,27 @@ st = status t = tag up = upload + [tag] sort = version:refname + [merge] conflictstyle = diff3 + [rebase] autosquash = true + [http] cookiefile = ~/.gitcookies + [transfer] # https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0 fsckobjects = true + [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = /usr/bin/git-merge-changelog %O %A %B + [sendemail] chainreplyto = false confirm = always -- 2.39.5