Skip to content

Commit

Permalink
feat: update git unpark to last non wip commit
Browse files Browse the repository at this point in the history
- rename git unpark to git unparkall
- new git park alias to go back to most recent non-wip commit
  • Loading branch information
cerico committed Jun 16, 2024
1 parent 665dbdc commit 518ab32
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions templates/gitconfig.j2
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
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-list --grep='^wip:' --invert-grep -n 1 HEAD)
unparkall = !git reset $(git rev-parse main)
unpark = !git reset $(git rev-parse main)
last = show HEAD
[push]
autoSetupRemote = true
Expand Down

0 comments on commit 518ab32

Please sign in to comment.