feat: update git park to last non wip commit

- also renames original git unpark alias to git unparkall
cerico · Jun 15, 2024 · 69b6e54 · 69b6e54
1 parent e5b2b2e
commit 69b6e54
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/templates/gitconfig.j2 b/templates/gitconfig.j2
@@ -21,7 +21,8 @@
         branches = ! git branch --no-merge main --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:reset)' --color=always | column -ts'|' | head -n 10
         full = ! git branch --format='%(HEAD)%(color:yellow)%(refname:short)|%(color:bold green)%(committerdate:relative)|%(color:blue)%(subject)|%(color:reset)' --color=always | column -ts'|'
         park = ! git add . && git commit -m \"wip: parking this here for now\"
-        unpark = !git reset  $(git rev-parse main)
+        unpark = !git reset $(git rev-list --grep='^wip:' --invert-grep -n 1 HEAD)
+        unparkall = !git reset  $(git rev-parse main)
         last = show HEAD
 [push]
         autoSetupRemote = true