From 4f3a76512ded2ab2283f10c8cb01d8d13cb66f36 Mon Sep 17 00:00:00 2001
From: singhman <singhman@users.noreply.github.com>
Date: Thu, 3 Apr 2014 19:47:48 -0700
Subject: [PATCH] Updated Cheetsheet

---
 Cheatsheet.textile | 44 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/Cheatsheet.textile b/Cheatsheet.textile
index 49a99e8..4334087 100644
--- a/Cheatsheet.textile
+++ b/Cheatsheet.textile
@@ -53,15 +53,53 @@ h2. Helpful aliases for common git tasks
 * @g@ - @git@
 * @gst@ - @git status@
 * @gl@ - @git pull@
-* @gup@ - @git fetch && git rebase@
+* @gup@ - @git pull --rebase@
 * @gp@ - @git push@
-* @gd@ - @git diff | mate@
-* @gdv@ - <code>git diff -w "$@" | vim -</code>
+* @gd@ - @git diff@
+* @gdc@ - @git diff --cached@
+* @gdv@ - <code>git diff -w "$@" | view -</code>
 * @gc@ - @git commit -v@
+* @gc!@ - @git commit -v --amend@
 * @gca@ - @git commit -v -a@
+* @gca!@ - @git commit -v -a --amend@
+* @gcmsg@ - @git commit -m@
 * @gco@ - @git checkout@
+* @gcm@ - @git checkout master@
+* @gr@ - @git remote@
+* @grv@ - @git remote -v@
+* @grmv@ - @git remote rename@
+* @grrm@ - @git remote remove@
+* @gsetr@ - @git remote set-url@
+* @grup@ - @git remote update@
+* @grbi@ - @git rebase -i@
+* @grbc@ - @git rebase --continue@
+* @grba@ - @git rebase --abort@
 * @gb@ - @git branch@
 * @gba@ - @git branch -a@
+* @gcount@ - @git shortlog -sn@
+* @gcl@ - @git config --list@
+* @gcp@ - @git cherry-pick@
+* @glg@ - @git log --stat --max-count=10@
+* @glgg@ - @git log --graph --max-count=10@
+* @glgga@ - @git log --graph --decorate --all@
+* @glo@ - @git log --oneline --decorate --color@
+* @glog@ - @git log --oneline --decorate --color --graph@
+* @gss@ - @git status -s@
+* @ga@ - @git add@
+* @gm@ - @git merge@
+* @grh@ - @git reset HEAD@
+* @grhh@ - @git reset HEAD --hard@
+* @gclean@ - @git reset --hard && git clean -dfx@
+* @gwc@ - @git whatchanged -p --abbrev-commit --pretty=medium@
+* @gsts@ - @git stash show --text@
+* @gsta@ - @git stash@
+* @gstp@ - @git stash pop@
+* @gstd@ - @git stash drop@
+* @ggpull@ - @git pull origin $(current_branch)@
+* @ggpur@ - @git pull --rebase origin $(current_branch)@
+* @ggpush@ - @git push origin $(current_branch)@
+* @ggpnp@ - @git pull origin $(current_branch) && git push origin $(current_branch)@
+* @glp@ - @_git_log_prettily@
 
 h2. Editors
 * @stt@ - @open current directory in Sublime Text 2@