git instuctions added

3 files changed, 42 insertions, 20 deletions

diff --git a/DevHive.code-workspace b/DevHive.code-workspace
index 5679111..e3e0ab6 100644
--- a/DevHive.code-workspace
+++ b/DevHive.code-workspace
@@ -7,7 +7,11 @@
 		{
 			"name": "Web",
 			"path": "./Web"
-		}
+		},
+        {
+            "name": "DevHive",
+            "path": "."
+        }
 	],
 	"settings": {
 		"files.exclude": {
diff --git a/Web/Web.code-workspace b/Web/Web.code-workspace
deleted file mode 100644
index 875e3c8..0000000
--- a/Web/Web.code-workspace
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"folders": [
-		{
-			"path": "."
-		}
-	],
-	"settings": {
-		"files.exclude": {
-			"**/.vscode": true,
-			"**/bin": true,
-			"**/obj": true,
-			".gitignore" : true,
-			"**/README.md" : true,
-			"**/LICENSE" : true,
-			"**/Properties" : true,
-			"**/*.code-workspace" : true
-		}
-	}
-}
\ No newline at end of file
diff --git a/git.md b/git.md
new file mode 100644
index 0000000..1adec79
--- /dev/null
+++ b/git.md
@@ -0,0 +1,37 @@
+# Git commands with instructions
+
+## git clone *url*
+
+Clones a GitHub repository in the current directory, in a folder, the name of which is the repo's name
+
+## git branch *option* *branch*
+
+git branch - View a list of the branches
+
+## git checkout *option* *branch*
+
+git checkout *branch_name* - Switch to exiting branch
+git checkout -b *branch_name* - Create a new branch
+
+## git fetch
+
+git fetch - Downloads commits, files and references from remote repo to local repo
+ Fetching is what you do when you want to see what everybody else has been working on.
+ Doesn't force a merge
+
+## git pull *option*
+
+git pull - Fetches changes and immediately merges them to local repo
+ Combo of git fetch & git merge
+git pull --rebase - "I want to put my changes on top of what everybody else has done in this branch."
+git pull --rebase origin - This simply moves your local changes onto the top of what everybody else has already contributed.
+
+## git add *files*
+
+git add . - Add all files to track the changes made to them
+git add *filename* - Add file with name *filename* to track the changes made to it
+
+## git commit *options*
+
+git commit - Opens a editor to write a message, documenting the changes made
+git commit -m *Message* - Write the message inline, documenting the changes made