balkian/senpy
1
0
Fork 0
mirror of https://github.com/gsi-upm/senpy synced 2024-11-22 00:02:28 +00:00
Code Issues Releases Wiki Activity

Remove makefiles from auto push/pull

Browse Source
This commit is contained in:
J. Fernando Sánchez 2018-11-06 17:10:08 +01:00
parent f1ec057b16
commit b48730137d
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.makefiles/git.mk
View File

@ -22,7 +22,4 @@ else
rm $(KEY_FILE) rm $(KEY_FILE)
endif endif
push:: git-push .PHONY:: commit tag git-push git-pull push-github
pull:: git-pull
.PHONY:: commit tag push git-push git-pull push-github

7
.makefiles/makefiles.mk
View File

@ -1,5 +1,5 @@
makefiles-remote: makefiles-remote:
@git remote add makefiles ssh://git@lab.cluster.gsi.dit.upm.es:2200/docs/templates/makefiles.git 2>/dev/null || true git ls-remote --exit-code makefiles 2> /dev/null || git remote add makefiles ssh://git@lab.cluster.gsi.dit.upm.es:2200/docs/templates/makefiles.git
makefiles-commit: makefiles-remote makefiles-commit: makefiles-remote
git add -f .makefiles git add -f .makefiles
@ -12,7 +12,4 @@ makefiles-push:
makefiles-pull: makefiles-remote makefiles-pull: makefiles-remote
git subtree pull --prefix=.makefiles/ makefiles master --squash git subtree pull --prefix=.makefiles/ makefiles master --squash
pull:: makefiles-pull .PHONY:: makefiles-remote makefiles-commit makefiles-push makefiles-pull
push:: makefiles-push
.PHONY:: makefiles-remote makefiles-commit makefiles-push makefiles-pull pull push