The assignments listed here should take you approximately 55 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:
touch budget.csv
100 touch notes
101 mkdir home
102 rm -rf home
103 ls
104 cd notes
105 rm notes
106 ls
107 mkdir notes
108 ls
109 cd notes
110 git_notes.txt
111 touch git_notes.txt
112 touch command_line_notes.txt
113 ls
114 cd ..
115 mkdir practice
116 touch git_practice.txt
117 ls
118 rm git_practice.txt
119 ls
120 cd practice
121 ls
122 touch git_practice.txt
123 mkdir projects
124 cd projects
125 touch game.js
126 history
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.txtfile to the staging area - Check the git status
- Create an initial commit
- Check the status
- Add your favorite quote to the
quotes.txtfile - 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):
Leighs-MacBook-Pro:~ leighlarson$ mkdir git_homework
Leighs-MacBook-Pro:~ leighlarson$ cd git_homework
Leighs-MacBook-Pro:git_homework leighlarson$ touch quotes.txt
Leighs-MacBook-Pro:git_homework leighlarson$ git init
Initialized empty Git repository in /Users/leighlarson/git_homework/.git/
Leighs-MacBook-Pro:git_homework leighlarson$ 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)
Leighs-MacBook-Pro:git_homework leighlarson$ git add quotes.txt
Leighs-MacBook-Pro:git_homework leighlarson$ git status
On branch master
No commits yet
Changes to be committed:
(use "git rm --cached <file>..." to unstage)
new file: quotes.txt
Leighs-MacBook-Pro:git_homework leighlarson$ git commit -m "Initial Commit"
[master (root-commit) 314a2cd] Initial Commit
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 quotes.txt
Leighs-MacBook-Pro:git_homework leighlarson$ git status
On branch master
nothing to commit, working tree clean
Leighs-MacBook-Pro:git_homework leighlarson$ atom .
Leighs-MacBook-Pro:git_homework leighlarson$ git status
On branch master
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: quotes.txt
no changes added to commit (use "git add" and/or "git commit -a")
Leighs-MacBook-Pro:git_homework leighlarson$ git status
On branch master
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: quotes.txt
no changes added to commit (use "git add" and/or "git commit -a")
Leighs-MacBook-Pro:git_homework leighlarson$ hit add quotes.txt
-bash: hit: command not found
Leighs-MacBook-Pro:git_homework leighlarson$ git add quotes.txt
Leighs-MacBook-Pro:git_homework leighlarson$ atom .
Leighs-MacBook-Pro:git_homework leighlarson$ git status
On branch master
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: quotes.txt
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: quotes.txt
Leighs-MacBook-Pro:git_homework leighlarson$ git diff
diff --git a/quotes.txt b/quotes.txt
index a3b6564..80af92e 100644
--- a/quotes.txt
+++ b/quotes.txt
@@ -1,3 +1,4 @@
"Wilma!!!!!" Fred Flinstone
"Don't believe me just watch" Bruno Mars
"Noo-clurr" George W Bush
+howdy!
Leighs-MacBook-Pro:git_homework leighlarson$ git add quotes.txt
Leighs-MacBook-Pro:git_homework leighlarson$ git status
On branch master
Changes to be committed:
(use "git restore --staged <file>..." to unstage)
modified: quotes.txt
Leighs-MacBook-Pro:git_homework leighlarson$ git commit -m "Final"
[master cdaa732] Final
1 file changed, 4 insertions(+)
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)
- color (string)
- recyclable (boolean)
Methods:
- break_down
- stack
- tear-up
- carry_items
-
Make sure that you're shell is set to bash by running the following command:
$ chsh -s /bin/bash. Remember to omit the$! -
Watch this video and follow each step to modify your own bash profile. As mentioned in the video, you will need this snippet below:
# get current branch in git repo
function parse_git_branch() {
BRANCH=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
if [ ! "${BRANCH}" == "" ]
then
STAT=`parse_git_dirty`
echo "[${BRANCH}${STAT}]"
else
echo ""
fi
}
# get current status of git repo
function parse_git_dirty {
status=`git status 2>&1 | tee`
dirty=`echo -n "${status}" 2> /dev/null | grep "modified:" &> /dev/null; echo "$?"`
untracked=`echo -n "${status}" 2> /dev/null | grep "Untracked files" &> /dev/null; echo "$?"`
ahead=`echo -n "${status}" 2> /dev/null | grep "Your branch is ahead of" &> /dev/null; echo "$?"`
newfile=`echo -n "${status}" 2> /dev/null | grep "new file:" &> /dev/null; echo "$?"`
renamed=`echo -n "${status}" 2> /dev/null | grep "renamed:" &> /dev/null; echo "$?"`
deleted=`echo -n "${status}" 2> /dev/null | grep "deleted:" &> /dev/null; echo "$?"`
bits=''
if [ "${renamed}" == "0" ]; then
bits=">${bits}"
fi
if [ "${ahead}" == "0" ]; then
bits="*${bits}"
fi
if [ "${newfile}" == "0" ]; then
bits="+${bits}"
fi
if [ "${untracked}" == "0" ]; then
bits="?${bits}"
fi
if [ "${deleted}" == "0" ]; then
bits="x${bits}"
fi
if [ "${dirty}" == "0" ]; then
bits="!${bits}"
fi
if [ ! "${bits}" == "" ]; then
echo " ${bits}"
else
echo ""
fi
}
export PS1="\u\w\`parse_git_branch\`$ "
If you have any questions, comments, or confusions that you would an instructor to address, list them below:
- None
-
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.
@leighlars Did you have a chance to use the git online command?