Git Workshop 11-16-2020

Walkthrough

1. Fork this repository

   • click on the fork button on the top right
   • select the desired location that you would like it forked

2. Clone the new forked repository

   • click the download button in the top right
   • copy the repo https
   • in the terminal, in the directory that you would like the project type git clone
   • git status

3. Make a branch of the repository

   • in the GitWorkshop directory type git branch branch
   • to go to that branch type git checkout branch
   • edit the file called test.txt by adding your name
   • make sure to add and commit your changes on the branch
   • to go back to the master branch type git checkout master
   • to merge your branch back to master type git merge branch
   • git status

4. Create a file to ignore

   • create a file called ignoreme.txt
   • git status

5. Creating a .gitignore

   • using your favorite text editor create a file called .gitignore
   • add the extensions or names of files you do not want included - ignoreme.txt
   • save the file and add, commit, and push
   • what happens to ignoreme.txt?
   • git status

Extra

6. Look at history of commits

   • git log

7. Look at unstaged changes made to a file

   • edit the test.txt file
   • git status
   • git diff
   • git diff test.txt
   • git add test.txt
   • git diff
   • git commit -m "editing test to visualize differences"
   • git diff

8. Undoing changes in specific file with checkout

   • two options
     • git checkout HEAD~1 test.txt
     • git checkout test.txt
   • makes your working directory match the exact state of the commit you've selected
   • git add test.txt
   • git commit -m "undo test changes"

9. Undoing changes in a commit with git revert

   • execute git revert HEAD
     • git creates a new commit with the inverse of the last commit (new commit undoing changes)
     • creates a commit history but easy to track

10. Undoing changes with git reset

    • git reset --hard
      • the commit history is reset to that specified commit
      • removes all commits after the specified commit id