From 9f30667b1e0b398e0fb97eaf6917e1e1ad5c8261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Fri, 11 Sep 2020 19:07:22 +0200 Subject: unwip : fix --- unwip | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/unwip b/unwip index 5220208..29ccf83 100755 --- a/unwip +++ b/unwip @@ -11,7 +11,12 @@ then do git reset --hard HEAD~1 done - git pull && git reset --soft HEAD~1 && git reset && git status + git pull || exit 1 + while [ "$(git log --format="%s" HEAD~1..)" == "WIP" ] + do + git reset --soft HEAD~1 + done + git reset && git status else echo "unknown cmd '$cmd'" && exit 1 fi -- cgit v1.1-2-g2b99