Remove unused file and update .gitignore
This commit is contained in:
2 files changed
+4
-15
No files matched your search
+4
-5
@@ -136,11 +136,10 @@ fabric.properties
|
|||||||
|
|
||||||
### vscode ###
|
### vscode ###
|
||||||
.vscode/*
|
.vscode/*
|
||||||
!.vscode/settings.json
|
|
||||||
!.vscode/tasks.json
|
|
||||||
!.vscode/launch.json
|
|
||||||
!.vscode/extensions.json
|
|
||||||
*.code-workspace
|
*.code-workspace
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
doc/
|
doc/
|
||||||
|
|
||||||
|
# CLang
|
||||||
|
compile_commands.json
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
git checkout upstream
|
|
||||||
git pull https://github.com/pixlra/calyp.git master
|
|
||||||
git push origin upstream
|
|
||||||
|
|
||||||
git checkout master
|
|
||||||
git pull origin master
|
|
||||||
git merge upstream
|
|
||||||
git push origin master
|
|
||||||
Reference in new issue
Block a user