From 2d236dee7a50db9a1a88234b9c68e4030e5b36b0 Mon Sep 17 00:00:00 2001
From: Gregory Eremin <g@erem.in>
Date: Fri, 8 Aug 2014 18:08:55 +0700
Subject: [PATCH] Updated git config

---
 git/gitconfig | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
index 8afa822..3dbad9f 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -2,7 +2,8 @@
   protocol = https
 [user]
   name = Gregory Eremin
-  email = magnolia_fan@me.com
+  email = g@erem.in
+	signingkey = EC26E86C
 [credential]
   helper = osxkeychain
 [alias]
@@ -12,8 +13,10 @@
   ci = commit
   rd = rebase -i development
   rh = rebase -i HEAD~5
+  cp = cherry-pick
   unstage = reset
   undo = reset --soft HEAD^
+  reword = git commit --amend -m
 [color]
   diff = auto
   status = auto
@@ -34,7 +37,7 @@
 [help]
   autocorrect = 1
 [achievement]
-	upload = true
+  upload = true
 [difftool "Kaleidoscope"]
   cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [diff]
@@ -44,3 +47,6 @@
   trustExitCode = true
 [merge]
   tool = Kaleidoscope
+[filter "media"]
+	clean = git-media-clean %f
+	smudge = git-media-smudge %f