From a72208f0e68a22f55289fa067df8d123f8fea283 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 6 Apr 2021 21:47:06 +0100 Subject: [PATCH] Remove unused file and update .gitignore --- .gitignore | 9 ++++----- update_upstream_and_merge_into_master.sh | 10 ---------- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100755 update_upstream_and_merge_into_master.sh diff --git a/.gitignore b/.gitignore index 4cb85b5..74424b9 100644 --- a/.gitignore +++ b/.gitignore @@ -136,11 +136,10 @@ fabric.properties ### vscode ### .vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json *.code-workspace # Documentation -doc/ \ No newline at end of file +doc/ + +# CLang +compile_commands.json \ No newline at end of file diff --git a/update_upstream_and_merge_into_master.sh b/update_upstream_and_merge_into_master.sh deleted file mode 100755 index d508df7..0000000 --- a/update_upstream_and_merge_into_master.sh +++ /dev/null @@ -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 \ No newline at end of file