From 8e76cca6bd0445d92b8d8954997958fc8669d5e9 Mon Sep 17 00:00:00 2001
From: hellerve <veit@veitheller.de>
Date: Wed, 22 Feb 2017 10:51:49 +0100
Subject: [PATCH] more mnemonics, make private email default

---
 gitconfig | 19 ++++++++++---------
 zshrc     |  3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/gitconfig b/gitconfig
index 7499422..82d6994 100644
--- a/gitconfig
+++ b/gitconfig
@@ -5,6 +5,7 @@
     co = checkout
     contains = branch --contains
     cr = codereview
+    df = diff
     exclude = !sh -c 'echo "$1" >> .git/info/exclude' -
     ignored = ls-files --others
     lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold cyan)- %an%C(reset)%C(bold yellow)%d%C(reset)'
@@ -51,12 +52,12 @@
     old = red bold
     new = green bold
 [color "grep"]
-  match = bold magenta
+    match = bold magenta
 [color "interactive"]
-  prompt = normal
-  header = normal
-  help = yellow
-  error = bold red
+    prompt = normal
+    header = normal
+    help = yellow
+    error = bold red
 [color "status"]
     added = yellow
     changed = green
@@ -82,9 +83,9 @@
     default = simple
 
 [user]
-	name = hellerve
-	email = veit@veitheller.de
+  name = hellerve
+  email = veit@veitheller.de
 [credential]
-	helper = osxkeychain
+  helper = osxkeychain
 [http]
-	postBuffer = 1048576000
+  postBuffer = 1048576000
diff --git a/zshrc b/zshrc
index f887d36..34b8799 100644
--- a/zshrc
+++ b/zshrc
@@ -43,7 +43,8 @@ alias mk="make"
 alias psh="perl ~/.scripts/psh"
 alias push="git push"
 alias pull="git pull"
-alias virtualenv2="python2.7 /usr/local/lib/python2.7/site_packages/virtualenv.py"
+alias g="git"
+alias virtualenv2="python2.7 /usr/local/lib/python2.7/site-packages/virtualenv.py"
 alias pupgrade2="pip2.7 install --upgrade pip; python2.7 ~/.pip-upgrade 2"
 alias pupgrade3="pip3 install --upgrade pip; python3 ~/.pip-upgrade 3"
 alias pupgrade="pupgrade2 && pupgrade3"