From e8c79f955ca6880ead01706dd40e7c864b1ebff5 Mon Sep 17 00:00:00 2001
From: Nathan Broadbent <nathan.f77@gmail.com>
Date: Thu, 29 Aug 2013 12:04:26 -0700
Subject: [PATCH] Added git stash pop alias (gashp)

---
 git.scmbrc.example | 1 +
 lib/git/aliases.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/git.scmbrc.example b/git.scmbrc.example
index 58abc62..94321aa 100644
--- a/git.scmbrc.example
+++ b/git.scmbrc.example
@@ -89,6 +89,7 @@ git_show_alias="gsh"
 git_show_summary="gsm"  # (gss taken by git status short)
 git_stash_alias="gash"
 git_stash_apply_alias="gasha"
+git_stash_pop_alias="gashp"
 git_stash_list_alias="gashl"
 git_tag_alias="gt"
 
diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index 89d12ff..a1f7762 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -126,6 +126,7 @@ if [ "$git_setup_aliases" = "yes" ]; then
   __git_alias "$git_show_summary" "git" 'show' '--summary'
   __git_alias "$git_stash_alias" "git" 'stash'
   __git_alias "$git_stash_apply_alias" "git" 'stash' 'apply'
+  __git_alias "$git_stash_pop_alias" "git" 'stash' 'pop'
   __git_alias "$git_stash_list_alias" "git" 'stash' 'list'
   __git_alias "$git_tag_alias" "git" 'tag'