Add make-stash-drop command
Sometimes you can get stuck in a loop where git stash pop preserves the stash commit. Dropping that commit if it's a STASH commit after an update is totally fine.
This commit is contained in:
4
Makefile
4
Makefile
@@ -16,6 +16,10 @@ warning:
|
||||
@printf "Cancel with ctrl + c within 3 seconds."
|
||||
@sleep 3
|
||||
|
||||
.PHONY: make-stash-drop
|
||||
make-stash-drop:
|
||||
@if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash drop; fi
|
||||
|
||||
.PHONY: make-update
|
||||
make-update: warning
|
||||
@git stash save $(STASH)
|
||||
|
||||
Reference in New Issue
Block a user