From 49bd2d92ae1cd04c5d28cb2fb500d569d5db1b85 Mon Sep 17 00:00:00 2001
From: Morgan Wattiez <morgan.wattiez@collibra.com>
Date: Fri, 1 Mar 2019 22:17:53 +0100
Subject: [PATCH] new aliases for git + vim config

---
 dot_gitconfig   | 18 ++++++++++++++++++
 dot_vimrc       |  3 +++
 dot_zsh_aliases |  1 +
 3 files changed, 22 insertions(+)

diff --git a/dot_gitconfig b/dot_gitconfig
index 33ac01f..30348a2 100644
--- a/dot_gitconfig
+++ b/dot_gitconfig
@@ -1,3 +1,21 @@
 [user]
 	name = Morgan Wattiez
 	email = morgan.wattiez@collibra.com
+
+[alias]
+	tags = log --no-walk --tags --pretty=\"%h %d %s\" --decorate=full
+	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
+	st = status
+	contrib = ! git log --pretty=format:'%aN' | sort | uniq -c | sort -nr
+	whois = ! sh -c 'git log -i --pretty=\"format:%an <%ae>\" --author=\"\" | sort -u' -
+	di = diff -w --color-words=.
+	ac = ! git add . && git commit -v
+	unstage = reset HEAD
+	ru = clean -f
+	b = branch -vvar
+	follow = ! sh -c 'git checkout -t origin/$1' -
+	unfollow = ! git checkout master && git branch -d
+	sortdiff = ! sh -c 'git diff  | grep ^[+-] | sort --key=1.2 | uniq -u -s1'
+	hist = log --pretty=format:\"%h %ad | %s%d [%an]\"  --graph --date=short
+	type = cat-file -t
+	dump = cat-file -p
diff --git a/dot_vimrc b/dot_vimrc
index e9abef5..37c8d4c 100644
--- a/dot_vimrc
+++ b/dot_vimrc
@@ -1 +1,4 @@
 syntax on
+set number
+colorscheme desert
+set laststatus=2
diff --git a/dot_zsh_aliases b/dot_zsh_aliases
index 5390039..e1440f6 100644
--- a/dot_zsh_aliases
+++ b/dot_zsh_aliases
@@ -22,6 +22,7 @@ alias me='mb'
 alias hack='hacker'
 alias done='task_done'
 alias h='cd $HOME'
+alias sshpub='cat ~/.ssh/id_rsa.pub'
 
 # Show/hide hidden files in Finder
 alias show="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"