The assignments listed here should take you approximately 25 total minutes.
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.
Need help? You can go back to the files/directories portion of the lesson here.
Scroll down to the bottom of this page and look at the image of the directories and files. Use commands in your terminal to create the directories and files structured exactly how they appear in the image.
When you're done, type history
to see your commands. Copy and paste the commands that were used to create the directory and files:
50 mkdir session_3_practice
51 ls
52 cd session_3_practice
53 touch budget.csv
54 touch mentors.txt
55 ls
56 mkdir notes
57 ls
58 cd notes
59 touch git_notes.txt
60 touch command_line_notes.txt
61 ls
62 cd ..
63 mkdir practice
64 ls
65 cd practice
66 touch git_practice.txt
67 ls
68 mkdir projects
69 ls
70 cd projects
71 touch game.js
72 ls
73 cd ..
74 cd ..
75 cd ..
76 rm -rf session_3_practice
77 ls
78 history
johnadams~$
Since this is just a practice directory, feel free to remove the parent directory session_3_practice
when you're done with this exercise.
You can reference the files/directories portion of the lesson here.
Follow the steps below to practice the git workflow. Be ready to copy-paste your terminal output as confirmation of your practice.
- Create a directory called
git_homework
. Inside of there, create a file calledquotes.txt
. - Initialize the directory
- Check the git status
- Add your
quotes.txt
file to the staging area - Check the git status
- Create an initial commit
- Check the status
- Add your favorite quote to the
quotes.txt
file - Check the status
- Check the diff
- Add the changes to the staging area
- Commit the new changes
- Check the status
- Show the log in oneline (yes,
oneline
, not a spelling error) format
Copy and paste all of the terminal text from this process below (not just the history):
johnadams~$ mkdir git_homework
johnadams~$ cd git_homework
johnadams~/git_homework$ touch quotes.txt
johnadams~/git_homework$ ls
quotes.txt
johnadams~/git_homework$ git init
Initialized empty Git repository in /Users/johnadams/git_homework/.git/
johnadams~/git_homework$ git status
On branch master
No commits yet
Untracked files:
(use "git add <file>..." to include in what will be committed)
quotes.txt
nothing added to commit but untracked files present (use "git add" to track)
johnadams~/git_homework$ git add quotes.txt
johnadams~/git_homework$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: quotes.txt
johnadams~/git_homework$ echo "If you don't know, the thing to do is not to get scared, but to learn. - Ayn Rand, Atlas Shrugged" >> quotes.txt
johnadams~/git_homework$ git commit -m 'Initial commit'
[master (root-commit) b7d2e3e] Initial commit
Committer: John Adams <[email protected]>
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. Run the
following command and follow the instructions in your editor to edit
your configuration file:
git config --global --edit
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 quotes.txt
johnadams~/git_homework[master !]$ git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: quotes.txt
no changes added to commit (use "git add" and/or "git commit -a")
johnadams~/git_homework[master !]$ echo "not all those who wander are lost - J. R. R. Tolkien" >> quotes.txt
johnadams~/git_homework[master !]$ git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: quotes.txt
no changes added to commit (use "git add" and/or "git commit -a")
johnadams~/git_homework[master !]$ git diff quotes.txt
diff --git a/quotes.txt b/quotes.txt
index e69de29..6d0537d 100644
--- a/quotes.txt
+++ b/quotes.txt
@@ -0,0 +1,2 @@
+If you don't know, the thing to do is not to get scared, but to learn. - Ayn Rand, Atlas Shrugged
+not all those who wander are lost - J. R. R. Tolkien
johnadams~/git_homework[master !]$ git add quotes.txt
johnadams~/git_homework[master !]$ git commit -m 'Addition of two quotes'
[master 7d0453e] Addition of two quotes
Committer: John Adams <[email protected]>
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. Run the
following command and follow the instructions in your editor to edit
your configuration file:
git config --global --edit
After doing this, you may fix the identity used for this commit with:
git commit --amend --reset-author
1 file changed, 2 insertions(+)
johnadams~/git_homework[master]$ git status
On branch master
nothing to commit, working tree clean
johnadams~/git_homework[master]$ oneline
-bash: oneline: command not found
johnadams~/git_homework[master]$ git oneline
git: 'oneline' is not a git command. See 'git --help'.
johnadams~/git_homework[master]$ --pretty=oneline
-bash: --pretty=oneline: command not found
johnadams~/git_homework[master]$ git log --pretty=oneline
7d0453eefd6b501b501278c9685d6b43c2425ec4 (HEAD -> master) Addition of two quotes
b7d2e3e3ba0fe0d9f3de156e383050e1ba4c1fe3 Initial commit
johnadams~/git_homework[master]$ git log --format=oneline
7d0453eefd6b501b501278c9685d6b43c2425ec4 (HEAD -> master) Addition of two quotes
b7d2e3e3ba0fe0d9f3de156e383050e1ba4c1fe3 Initial commit
johnadams~/git_homework[master]$
IMPORTANT: Do not remove this git_homework
directory. You will be using this directory during Thursday's session.
Look at the template below for a CardboardBox
class. Fill in missing blanks with additional attributes and methods.
Class: CardboardBox
Attributes:
- width (integer)
- depth (integer)
- height (integer)
- weight (integer)
Methods:
- break_down
- stack
- assemble
- pack
If you have any questions, comments, or confusions that you would an instructor to address, list them below:
- I think I figured out how to show the log in oneline format, but am not sure. Can you confirm that it is correct? I also could not tell a difference between the pretty=oneline versus the format=oneline inputs - are those essentially the same thing or what is the difference?
-
If time permits and you want extra git practice and alternative explanations (it's often beneficial to have something explained in many different ways), check out Codecademy's Git Course, particularly the first free item on the syllabus, "Basic Git Workflow". In Mod 0, we will not cover anything beyond Codecademy's intro section; however, you are welcome to check out the other git lessons listed on the syllabus if you want a head start.
-
This course is how I personally learned command line. If time permits, I highly recommend reading and practicing.
-
Also recommended by Jeff Casimir: Michael Hartl's Learn Enough Command Line.
-
Add tab completion to make your life easier: Type Less. Do More.
Hey John - Solid job on these assignments. As for your questions: Both
git log --format=oneline
andgit log --pretty=oneline
produce the same output. Many times during your time programming you will find commands that essentially do the same thing. This is a way to see the log of each commit on one line. Another command with slightly different output/formatting isgit log --oneline
.