This commit is contained in:
Mayel 2021-06-08 16:21:51 +02:00
parent bdc696e4a4
commit 887e4a68eb
2 changed files with 6 additions and 2 deletions

View file

@ -127,7 +127,10 @@ update.dep~%: ## Update a specify dep (eg. `make update.dep~pointers`)
@chmod +x git-publish.sh
./git-publish.sh $(FORKS_PATH)/$* pull
update.forks: git.forks~pull ## Pull the latest commits from all ./forks
#update.forks: git.forks~pull ## Pull the latest commits from all ./forks
update.forks: ## Pull the latest commits from all ./forks
@chmod +x git-publish.sh
./git-publish.sh $(FORKS_PATH)/$* pull
deps.get: mix.remote~deps.get mix~deps.get ## Fetch locked version of non-forked deps

View file

@ -17,12 +17,13 @@ then
git config core.fileMode false
# if there are changes, commit them (needed before being able to rebase)
git diff-index --quiet HEAD || git commit --verbose --all
git diff-index --quiet HEAD || git commit --verbose --all || echo Skipped...
# fetch and rebase remote changes
git pull --rebase
echo Publishing changes!
git push
else