CAREFULLY READ ALL THE INSTRUCTIONS BEFORE STARTING THESE EXERCISES!
To start this assignment:
- Click the button in the upper right-hand corner that says Fork. This is now your copy of the document.
- Click the Edit button when you're ready to start adding your answers.
- To save your work, click the green button in the bottom right-hand corner. You can always come back and re-edit your gist.
Review this article on git commit messages, especially the section on the 7 Rules of Great Commit Messages
- I have successfully retained the knowledge from when I did Mod 0 the first time, it's good review and a good ramp - up for Mod 1. I'm excited to start now that I'm a little bit more ready!
- I've still been having trouble with getting on task with things. I am hoping that getting back into my routine and keeping my apartment clean. Working remotely is a challenge and I need to make my environment as conducive for school as I can.
We will be using the below git worklfow as part of our Session 3 practice. See if you are able to complete this exercise WITHOUT referencing any notes, documentation, etc.
- Create a directory called
git_homework
. Inside of there, create a file calledthoughts.md
- Initialize the directory
- Use
git status
to ensure you are set up for tracking using Git - Add your
thoughts.md
to the staging area - Check the
git status
- Create an initial commit (Note: Be sure to follow the correct message format for your first commit!)
- Check the
git status
- Add two takeaways you've had from your first few classes of Mod 0 as it relates to success at Turing.
- Check the
git status
- Check the changes you've made using
git diff
- Add the changes to the staging area
- Commit the new changes (Note: Be sure to follow convention for commit messages!)
- Check the status
- Add two new strategies you are committed to trying during the rest of Mod 0 to
thoughts.md
- Add the changes to the staging area
- Commit the new changes (Note: Be sure to follow convention for commit messages!)
- Add at least one shoutout to someone who has helped you, supported you, or just been a positive presence in the last two weeks!
- Add the changes to the staging area
- Commit the new changes (Note: Be sure to follow convention for commit messages!)
- Show the log of your work in
oneline
format usinggit log
(This will likely require some Googling)
Copy and paste all of the terminal text from this process below (not just the history):
maryharrod@MacBook-Pro ~ % ls
Applications Documents Library Music Public
Desktop Downloads Movies Pictures
maryharrod@MacBook-Pro ~ % mkdir mod0_repeat
maryharrod@MacBook-Pro ~ % cd mod0_repeat/
maryharrod@MacBook-Pro mod0_repeat % touch study_skills.md resources.md
maryharrod@MacBook-Pro mod0_repeat % ls
resources.md study_skills.md
maryharrod@MacBook-Pro mod0_repeat % mkdir notes
maryharrod@MacBook-Pro mod0_repeat % cd notes
maryharrod@MacBook-Pro notes % touch session_1.md
maryharrod@MacBook-Pro notes % touch session_2.md
maryharrod@MacBook-Pro notes % mkdir assessment
maryharrod@MacBook-Pro notes % cd assessment/
maryharrod@MacBook-Pro assessment % touch checklist.md
maryharrod@MacBook-Pro assessment % mkdir study_guide
maryharrod@MacBook-Pro assessment % cd study_guide/
maryharrod@MacBook-Pro study_guide % touch study_guide.md
maryharrod@MacBook-Pro study_guide % history
8 clear
9 ls
10 mkdir mod0_repeat
11 cd mod0_repeat
12 touch study_skills.md resources.md
13 ls
14 mkdir notes
15 cd notes
16 touch session_1.md
17 touch session_2.md
18 mkdir assessment
19 cd assessment
20 touch checklist.md
21 mkdir study_guide
22 cd study_guide
23 touch study_guide.md
maryharrod@MacBook-Pro study_guide % mkdir turing
maryharrod@MacBook-Pro study_guide % cd turing
maryharrod@MacBook-Pro turing % touch mod_0 mod_1 mod_2 mod_3 mod_4
maryharrod@MacBook-Pro turing % ls
mod_0 mod_1 mod_2 mod_3 mod_4
maryharrod@MacBook-Pro turing % touch professional_development gear_up
maryharrod@MacBook-Pro turing % clear
maryharrod@MacBook-Pro turing % ls
gear_up mod_3
mod_0 mod_4
mod_1 professional_development
mod_2
maryharrod@MacBook-Pro turing % cd
maryharrod@MacBook-Pro ~ % clear
maryharrod@MacBook-Pro ~ % mkdir git_homework
maryharrod@MacBook-Pro ~ % cd git_homework/
maryharrod@MacBook-Pro git_homework % touch thoughts.md
maryharrod@MacBook-Pro git_homework % git init
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: git config --global init.defaultBranch <name>
hint:
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint:
hint: git branch -m <name>
Initialized empty Git repository in /Users/maryharrod/git_homework/.git/
maryharrod@MacBook-Pro git_homework % git config --global init.defaultBranch main
maryharrod@MacBook-Pro git_homework % git status
On branch master
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
thoughts.md
nothing added to commit but untracked files present (use "git add" to track)
maryharrod@MacBook-Pro git_homework % git branch -m main
maryharrod@MacBook-Pro git_homework % git status
On branch main
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
thoughts.md
nothing added to commit but untracked files present (use "git add" to track)
maryharrod@MacBook-Pro git_homework % git add thoughts.md
maryharrod@MacBook-Pro git_homework % git status
On branch main
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: thoughts.md
maryharrod@MacBook-Pro git_homework % git commit -m"Initial commit"
[main (root-commit) 496de71] Initial commit
Committer: Mary Harrod <maryharrod@MacBook-Pro.domain>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name "Your Name"
git config --global user.email you@example.com
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 thoughts.md
maryharrod@MacBook-Pro git_homework % git status
On branch main
nothing to commit, working tree clean
maryharrod@MacBook-Pro git_homework % atom thoughts.md
zsh: command not found: atom
maryharrod@MacBook-Pro git_homework % atom thoughts.md
zsh: command not found: atom
maryharrod@MacBook-Pro git_homework % atom thoughts.md
maryharrod@MacBook-Pro git_homework % git status
On branch main
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: thoughts.md
no changes added to commit (use "git add" and/or "git commit -a")
maryharrod@MacBook-Pro git_homework % git diff
diff --git a/thoughts.md b/thoughts.md
index e69de29..7582395 100644
--- a/thoughts.md
+++ b/thoughts.md
@@ -0,0 +1,3 @@
+a takeaway I've had with my time at Turing is that I really do need to plot out time for myself in my calendar to take care of myself to make my workload sustainable.
+
+Turing is an intensive program, and if I am just scheduling as much time as possible on work I will burnout and my body will force me to take the time I need. It's much better to do this by choice, so I've made the first part of my day after my morning routine dedicated to my own free time. This way I don't just go through my work and then by the end of the day tell myself that I can just skip it in favor of doing more homework to catch up.
maryharrod@MacBook-Pro git_homework % git add thoughts.md
maryharrod@MacBook-Pro git_homework % git commit "Add mod0 takeaways"
error: pathspec 'Add mod0 takeaways' did not match any file(s) known to git
maryharrod@MacBook-Pro git_homework % git commit -m"add mod0 takeaways"
[main fe364c5] add mod0 takeaways
Committer: Mary Harrod <maryharrod@MacBook-Pro.domain>
Your name and email address were configured automatically based
on your username and hostname. Please check that they are accurate.
You can suppress this message by setting them explicitly:
git config --global user.name "Your Name"
git config --global user.email you@example.com
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
1 file changed, 3 insertions(+)
maryharrod@MacBook-Pro git_homework % git config --global user.name "Katy"
maryharrod@MacBook-Pro git_homework % git config --global user.email m.catherine.harrod@gmail.com
maryharrod@MacBook-Pro git_homework % git commit --amend --reset-author
[main fb356f9] add takeaways
1 file changed, 3 insertions(+)
maryharrod@MacBook-Pro git_homework % git status
On branch main
nothing to commit, working tree clean
maryharrod@MacBook-Pro git_homework % atom thoughts.md
maryharrod@MacBook-Pro git_homework % git status
On branch main
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: thoughts.md
no changes added to commit (use "git add" and/or "git commit -a")
maryharrod@MacBook-Pro git_homework % git diff
diff --git a/thoughts.md b/thoughts.md
index 7582395..14ae5f3 100644
--- a/thoughts.md
+++ b/thoughts.md
@@ -1,3 +1,7 @@
a takeaway I've had with my time at Turing is that I really do need to plot out time for myself in my calendar to take care of myself to make my workload sustainable.
Turing is an intensive program, and if I am just scheduling as much time as possible on work I will burnout and my body will force me to take the time I need. It's much better to do this by choice, so I've made the first part of my day after my morning routine dedicated to my own free time. This way I don't just go through my work and then by the end of the day tell myself that I can just skip it in favor of doing more homework to catch up.
+
+two strategies I am committed to trying for the school program is streamlining all my activities in my calendar to make space for my homework and my physical therapy exercises I have to do to manage my connective tissue disorder. What this will mean for me is spending 5-10 minutes at mealtimes on drinking protein drinks, instant meals, and smoothies rather than 45 minutes on making and eating a meal. Doing yoga stretches every other day instead of every day. Keeping my hair in a braid as often as possible. Temporarily halting my dream journal practice for the duration of the program. Experimenting to see if I can break up my strengthening exercises in the 5 minute pomodoro breaks instead of 1 45 - minute workout every day.
+
+Another strategy I will be employing is the pomodoro technique. I decided to download the marinara chrome extension to have it built into the computer while I'm doing my work, rather than trying to keep a phone timer. I've noticed that adding the white noise for the 25 minute duration helps me recognize when it's time to focus and know that it's actually working. I hope that the 25 minute on, 5 minute off work routine will help make this workload more sustainable, as I've come to the conclusion that I will need to fit in as much homework time as possible every day of the week to keep up with the workload.
maryharrod@MacBook-Pro git_homework % git add thoughts.md
maryharrod@MacBook-Pro git_homework % git commit -m"add strategies"
[main 077c6bc] add strategies
1 file changed, 4 insertions(+)
maryharrod@MacBook-Pro git_homework % git commit --amend
[main 5e38be7] Add strategies
Date: Sat Sep 11 17:02:01 2021 -0600
1 file changed, 4 insertions(+)
maryharrod@MacBook-Pro git_homework % git log
commit 5e38be7f182bf4f88504fd9d6a8727a82f0af3ef (HEAD -> main)
Author: Katy <m.catherine.harrod@gmail.com>
Date: Sat Sep 11 17:02:01 2021 -0600
Add strategies
commit fb356f9d6155a1e79031c5d2878e15dcf3bc49e8
Author: Katy <m.catherine.harrod@gmail.com>
Date: Fri Sep 10 17:32:26 2021 -0600
add takeaways
commit 496de71159d288cf05021e670edb18cf7573507d
Author: Mary Harrod <maryharrod@MacBook-Pro.domain>
Date: Fri Sep 10 17:03:18 2021 -0600
Initial commit
maryharrod@MacBook-Pro git_homework % git rebase -i HEAD~2
[detached HEAD bc43f18] Add takeaways
Date: Fri Sep 10 17:32:26 2021 -0600
1 file changed, 3 insertions(+)
Successfully rebased and updated refs/heads/main.
maryharrod@MacBook-Pro git_homework % git log
commit 678ed04bd3e7a79c69ba50d377f2c7f78a3456c5 (HEAD -> main)
Author: Katy <m.catherine.harrod@gmail.com>
Date: Sat Sep 11 17:02:01 2021 -0600
Add strategies
commit bc43f182a46955973b86c2622e578b3448137201
Author: Katy <m.catherine.harrod@gmail.com>
Date: Fri Sep 10 17:32:26 2021 -0600
Add takeaways
commit 496de71159d288cf05021e670edb18cf7573507d
Author: Mary Harrod <maryharrod@MacBook-Pro.domain>
Date: Fri Sep 10 17:03:18 2021 -0600
Initial commit
maryharrod@MacBook-Pro git_homework % git status
On branch main
nothing to commit, working tree clean
maryharrod@MacBook-Pro git_homework % atom thoughts.md
zsh: command not found: atom
maryharrod@MacBook-Pro git_homework %
ln -s /Applications/Atom.app/Contents/Resources/app/atom.sh /usr/local/bin/atom ln -s /Applications/Atom.app/Contents/Resources/app/atom.sh /usr/local/bin/atom
ln: /usr/local/bin/atom: File exists
maryharrod@MacBook-Pro git_homework % atom
zsh: command not found: atom
maryharrod@MacBook-Pro git_homework %
brew install --cask atom atom thoughts.md
maryharrod@MacBook-Pro git_homework % atom thoughts.md
maryharrod@MacBook-Pro git_homework % git add thoughts.md
maryharrod@MacBook-Pro git_homework % git commit -m"Add shoutout"
[main d00839e] Add shoutout
1 file changed, 4 insertions(+), 1 deletion(-)
maryharrod@MacBook-Pro git_homework % git log --pretty=oneline
d00839e9f22c45d1f5b29403d6f38bf6b2b5fc49 (HEAD -> main) Add shoutout
678ed04bd3e7a79c69ba50d377f2c7f78a3456c5 Add strategies
bc43f182a46955973b86c2622e578b3448137201 Add takeaways
496de71159d288cf05021e670edb18cf7573507d Initial commit
maryharrod@MacBook-Pro git_homework %
IMPORTANT: Do NOT remove this git_homework
directory. You will be using this directory during the next session.
See if you are able to complete this exercise WITHOUT referencing any notes, documentation, etc.
- Create a directory called
git_practice_2
. Inside of there, create three filesnotes.md
,README.md
andmind_blown.jpg
- Initialize the directory
- Use
git status
to ensure you are set up for tracking using Git - Add all of the files to the staging area and check they have been added correctly
- Create an initial commit (Note: Be sure to follow the correct message format for your first commit!)
- Open your
notes.md
file in your text editor and add 1 heading, a bulleted list, and a code block. - Add the changes to the staging area
- Commit the new changes
- Check the status
- Add an inline code snippet, bold text and a numbered list to your
notes.md
file - Add the changes to the staging area
- Commit the new changes (Note: Be sure to follow convention for commit messages!)
- Remove the
README.md
andmind_blown.jpg
file from yourgit_practice_2
directory - Add the changes to the staging area
- Commit the new changes
- Show the log of your work in
oneline
format usinggit log
(This will likely require some Googling)
Copy and paste all of the terminal text from this process below (not just the history):
maryharrod@MacBook-Pro ~ % mkdir git_practice_2
maryharrod@MacBook-Pro ~ % cd git_
cd: no such file or directory: git_
maryharrod@MacBook-Pro ~ % cd git_practice_2
maryharrod@MacBook-Pro git_practice_2 % touch notes.md README.md mind_blown.jpg
maryharrod@MacBook-Pro git_practice_2 % pwd
/Users/maryharrod/git_practice_2
maryharrod@MacBook-Pro git_practice_2 % git init
Initialized empty Git repository in /Users/maryharrod/git_practice_2/.git/
maryharrod@MacBook-Pro git_practice_2 % git status
On branch main
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
README.md
mind_blown.jpg
notes.md
nothing added to commit but untracked files present (use "git add" to track)
maryharrod@MacBook-Pro git_practice_2 % git add README.md mind_blown.jpg notes.md
maryharrod@MacBook-Pro git_practice_2 % git status
On branch main
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: README.md
new file: mind_blown.jpg
new file: notes.md
maryharrod@MacBook-Pro git_practice_2 % git commit -m"Initial commit"
[main (root-commit) 33250e6] Initial commit
3 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 README.md
create mode 100644 mind_blown.jpg
create mode 100644 notes.md
maryharrod@MacBook-Pro git_practice_2 % atom notes.md
maryharrod@MacBook-Pro git_practice_2 % git add notes.md
maryharrod@MacBook-Pro git_practice_2 % git commit -m "Practice with markdown"
[main 3b77a51] Practice with markdown
1 file changed, 7 insertions(+)
maryharrod@MacBook-Pro git_practice_2 % git status
On branch main
nothing to commit, working tree clean
maryharrod@MacBook-Pro git_practice_2 % git add notes.md
maryharrod@MacBook-Pro git_practice_2 % git commit -m"Add colors tutorial"
[main d5c5fdc] Add colors tutorial
1 file changed, 45 insertions(+)
maryharrod@MacBook-Pro git_practice_2 % pwd
/Users/maryharrod/git_practice_2
maryharrod@MacBook-Pro git_practice_2 % rm -rf mind_blown.jpg README.md
maryharrod@MacBook-Pro git_practice_2 % ls
notes.md
maryharrod@MacBook-Pro git_practice_2 % git status
On branch main
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted: README.md
deleted: mind_blown.jpg
no changes added to commit (use "git add" and/or "git commit -a")
maryharrod@MacBook-Pro git_practice_2 % git add/rm README.md
git: 'add/rm' is not a git command. See 'git --help'.
maryharrod@MacBook-Pro git_practice_2 % cgit add git_practice_2
zsh: command not found: cgit
maryharrod@MacBook-Pro git_practice_2 % cd ..
maryharrod@MacBook-Pro ~ % git add git_practice_2
fatal: not a git repository (or any of the parent directories): .git
maryharrod@MacBook-Pro ~ % git status
fatal: not a git repository (or any of the parent directories): .git
maryharrod@MacBook-Pro ~ % pwd
/Users/maryharrod
maryharrod@MacBook-Pro ~ % ls
Applications Downloads Music git_homework
Desktop Library Pictures git_practice_2
Documents Movies Public mod0_repeat
maryharrod@MacBook-Pro ~ % cd git_practice_2
maryharrod@MacBook-Pro git_practice_2 % git status
On branch main
Changes not staged for commit:
(use "git add/rm <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
deleted: README.md
deleted: mind_blown.jpg
no changes added to commit (use "git add" and/or "git commit -a")
maryharrod@MacBook-Pro git_practice_2 % git add git_practice_2
fatal: pathspec 'git_practice_2' did not match any files
maryharrod@MacBook-Pro git_practice_2 % git add -u
maryharrod@MacBook-Pro git_practice_2 % git status
On branch main
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
deleted: README.md
deleted: mind_blown.jpg
maryharrod@MacBook-Pro git_practice_2 % git commit -m"Delete two files"
[main 0b97563] Delete two files
2 files changed, 0 insertions(+), 0 deletions(-)
delete mode 100644 README.md
delete mode 100644 mind_blown.jpg
maryharrod@MacBook-Pro git_practice_2 % git status
On branch main
nothing to commit, working tree clean
maryharrod@MacBook-Pro git_practice_2 % ls
notes.md
maryharrod@MacBook-Pro git_practice_2 % git log --pretty=oneline
0b97563493697198f50e3f3fb780ef738834d2a9 (HEAD -> main) Delete two files
d5c5fdcd1b6bf44c33db817872c193b59c605505 Add colors tutorial
3b77a51f9dc95ca5639c2ae319e2efcfbf7b0f8b Practice with markdown
33250e657c75d3440289e2527b4abb735258f526 Initial commit
maryharrod@MacBook-Pro git_practice_2 %
Using the rubric below, assess how you did with these exercises. These are the same metrics your instructors will use to determine if you are prepared for Mod 1!
- I read carefully read ALL directions
- I completed all parts of the exercises (not including Extensions) to the best of my ability
- I used correct syntax, spacing and naming conventions
- I followed ALL formatting instructions
- I pushed myself out of my comfort zone and experimented/broke things to try to learn
- I spent no longer than 20-30 mins Googling a specific problem before asking for help
- I went back to the lesson to search for clarification before asking for help
If you have any questions, comments, or confusions that you would like an instructor to address, list them below:
- I've noticed I spent a good chunk of time on perfecting my mistakes when I've made them. Would it be better to save that time and turn in a project with more flaws?
Are you stuck on something? Here is the BEST way to ask for help:
- Start or reply in the thread with the problem you are facing. Be sure to follow the guidelines for asking questions below:
- I can explain what I am trying to do or accomplish
- I can what I have tried so far and/or what resources I've tried online
- I can describe specifically what I am stuck on
- I provided screenshots and/or code examples to give context
- If I provided short code examples, I used
inline code formatting
for single lines of code/error messages - If I provided larger blocks of code, I used a code snippet in the correct format (such as
.js
or.rb
)
- If I provided short code examples, I used
- Usually, your classmates will be able to answer your question or point you in the right direction very quickly! If not, an instructor will reply within 24-48 hours