From 02bad2f3baf2aa8f323f2f5ea36954a08b1bc5bc Mon Sep 17 00:00:00 2001
From: Will Hilton <wmhilton@gmail.com>
Date: Thu, 11 Aug 2016 14:44:08 -0400
Subject: [PATCH] Fix g squash

---
 bin/g | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/g b/bin/g
index 9c2de63..ab5c24c 100755
--- a/bin/g
+++ b/bin/g
@@ -384,9 +384,17 @@ then
             --ancestry-path \
             --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' \
             HEAD...HEAD~$2
-    read -p 'Message: ' msg
+    echo "The parent commit will be:"
+    git log --abbrev-commit \
+            --color \
+            --graph \
+            --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' \
+            -n 1 \
+            HEAD~$2
+    def_msg="$(git show -s --format=%s HEAD~$(($2-1)))"
+    read -e -p 'Message: ' -i "$def_msg" msg
     git stash save --include-untracked --quiet 'get-squash autostash'
-    git reset --soft HEAD~$(($2+1))
+    git reset --soft HEAD~$2
     git commit -m "$msg"
     git stash pop --quiet
 else