Merge pull request #723 from bittner/feature/git-undo-soft-leave-changes-staged

Make `git undo -s` restore the staging area

Author: spacewander

AUTHORS

@@ -168,6 +168,7 @@ Patches and Suggestions
 - Nick Campbell
 - Nick Payne
 - Niklas Fiekas
+- Peter Bittner
 - Prayag Verma
 - R. Martinho Fernandes
 - Raphael Fleischlin

bin/git-undo

@@ -23,15 +23,15 @@ EOL
     ;;
   --hard)
     test $2 -gt 1 > /dev/null 2>&1 && back="~$2"
-    git reset --hard HEAD$back && exit 0;
+    git reset --hard HEAD$back
     ;;
   -s|--soft)
     test $2 -gt 1 > /dev/null 2>&1 && back="~$2"
+    git reset --soft HEAD$back
     ;;
   *)
     test $1 -gt 1 > /dev/null 2>&1 && back="~$1"
+    git reset --soft HEAD$back
+    git reset
     ;;
 esac
-
-git reset --soft HEAD$back
-git reset

man/git-undo.1

@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "GIT\-UNDO" "1" "April 2018" "" "Git Extras"
+.TH "GIT\-UNDO" "1" "June 2018" "" "Git Extras"
 .
 .SH "NAME"
 \fBgit\-undo\fR \- Remove latest commits
@@ -16,7 +16,7 @@ Removes the latest commits\.
 \-\-soft or \-s
 .
 .P
-This is the default, only rolls back the commit but changes remain un\-staged\.
+Rolls back the commit(s) but leaves the changes in the staging area\.
 .
 .P
 \-\-hard or \-h
@@ -44,6 +44,19 @@ $ git undo
 .IP "" 0
 .
 .P
+Removes the latest commit, restoring the staging area\.
+.
+.IP "" 4
+.
+.nf
+
+$ git undo \-s
+.
+.fi
+.
+.IP "" 0
+.
+.P
 Remove the latest 3 commits:
 .
 .IP "" 4

man/git-undo.html

@@ -13,7 +13,7 @@ git-undo(1) -- Remove latest commits
 
   --soft or -s
 
-  This is the default, only rolls back the commit but changes remain un-staged.
+  Rolls back the commit(s) but leaves the changes in the staging area.
 
   --hard or -h
 
@@ -30,6 +30,10 @@ git-undo(1) -- Remove latest commits
 
     $ git undo
 
+  Removes the latest commit, restoring the staging area.
+
+    $ git undo -s
+
   Remove the latest 3 commits:
 
     $ git undo 3