From 9748021dbba0630cc2bb052d29a0d75d5ec6b920 Mon Sep 17 00:00:00 2001
From: Dmitry Kislyuk <dkislyuk@pinterest.com>
Date: Wed, 22 Apr 2015 11:12:29 -0700
Subject: [PATCH] updates

---
 osx_settings.sh | 5 +++++
 zshrc           | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 osx_settings.sh

diff --git a/osx_settings.sh b/osx_settings.sh
new file mode 100644
index 0000000..fdede4a
--- /dev/null
+++ b/osx_settings.sh
@@ -0,0 +1,5 @@
+# Fast key repeat rate
+defaults write GlobalDomain KeyRepeat -int 0
+
+# Fast window maximizing
+defaults write -g NSWindowResizeTime -float 0.003
diff --git a/zshrc b/zshrc
index 95626ec..9b0af12 100644
--- a/zshrc
+++ b/zshrc
@@ -90,12 +90,13 @@ alias la='ls -a'
 alias gs='git status'
 alias gl='git log'
 alias gd='git diff'
+alias gsh='git show'
 alias gc='git commit -a -m'
-alias grim='gc "to be squashed commit" && git rebase -i master'
 alias gco="git checkout"
 alias gb='git branch'
 alias gcm='git checkout master'
 alias ga='git commit -a --amend'
+alias grm='git rebase upstream/master'
 alias gp='git pull upstream master'
 alias gra='git reset --soft HEAD@{1}'