From c2e20e9ed566801ebde2cee96ccee66294a5432c Mon Sep 17 00:00:00 2001 From: bnewbold Date: Thu, 19 May 2016 19:47:02 -0700 Subject: gitconfig: github user, cdiff, diffoscope tool --- .gitconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitconfig b/.gitconfig index 07f45aa..e97cccb 100644 --- a/.gitconfig +++ b/.gitconfig @@ -5,3 +5,13 @@ email = bnewbold@robocracy.org [color] ui = true +[alias] + cdiff = diff --word-diff=color +[github] + user = bnewbold +[difftool] + prompt = false +[difftool "diffoscope"] + cmd = "if [ $LOCAL = /dev/null ]; then diffoscope --new $REMOTE; else diffoscope $LOCAL $REMOTE; fi" +[difftool "diffoscope-html"] + cmd = "if [ $LOCAL = /dev/null ]; then diffoscope --new $REMOTE --html - | bcat; else diffoscope $LOCAL $REMOTE --html - | bcat; fi" -- cgit v1.2.3