From be721342d7ab274e9cee1a747891274ded4872a8 Mon Sep 17 00:00:00 2001 From: grub-basket Date: Sat, 29 Sep 2018 18:14:37 -0700 Subject: [PATCH 1/2] Edit file to complete pre-course HW requirements. --- README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index c4dcbed..7743ed3 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,15 @@ # Pre Course Git Fu [Pre Class Video](https://youtu.be/ZihgMcrHOF4) ## Terms for learning Git - * Repository - - * Git - Version Control - - * Clone - - * Fork - - * History - + * Repository - A area contaning the files for a project. + * Git - Version Control - A version control file system that allows for collaboration. + * Clone - To duplicate a project. + * Fork - To make a separate branch of a project, resulting in cloning and then rebranching. + * History - The changes made to files, including the deletion of files. * Staging - * Remote - - * Commit - - * Push - + * Commit - Commits the changes to the files to the file on the VCS. + * Push - Pushes the changes to the selected branch. ## Steps to our Lamba School Git Flow 1. Fork repository @@ -19,3 +19,5 @@ 5. `git status` to check what is staged 6. `git commit -m 'made changes to the Readme'` 7. `git push` + +I am editing this file, as no other content was requested. From c7ee7762667c3bdd7d069082f66331e62529b09b Mon Sep 17 00:00:00 2001 From: grub-basket Date: Sun, 30 Sep 2018 22:22:20 -0700 Subject: [PATCH 2/2] Complete definitions Completed for Staging and Remote --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7743ed3..9ebda50 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ * Clone - To duplicate a project. * Fork - To make a separate branch of a project, resulting in cloning and then rebranching. * History - The changes made to files, including the deletion of files. - * Staging - - * Remote - + * Staging - Preparing a file that will be committed. + * Remote - Content that isn't on a local branch/computer/server. * Commit - Commits the changes to the files to the file on the VCS. * Push - Pushes the changes to the selected branch.