summaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
authorbnewbold <bnewbold@robocracy.org>2016-05-19 19:47:02 -0700
committerbnewbold <bnewbold@robocracy.org>2016-05-19 19:47:02 -0700
commitc2e20e9ed566801ebde2cee96ccee66294a5432c (patch)
tree28ac976693a61e3f581058fe089d0b394ca8c57b /.gitconfig
parent710dfeca5116bd925ccd2a69dbf027b64b36f576 (diff)
downloadopenwrt-repro-c2e20e9ed566801ebde2cee96ccee66294a5432c.tar.gz
openwrt-repro-c2e20e9ed566801ebde2cee96ccee66294a5432c.zip
gitconfig: github user, cdiff, diffoscope tool
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig10
1 files changed, 10 insertions, 0 deletions
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"