Checkpoint: Git's Model

Question 1 of 5

• The version you saved most recently.
• Both versions, as two separate commits.
• The version as it was when you ran git add.
• Neither; Git refuses to commit a file that changed after staging.

Question 2 of 5

A  contact.html
?? notes.txt

• Only contact.html.
• Both files, because they’re both new.
• Nothing, because untracked files block a commit.
• Only notes.txt, because ?? means it’s ready.

Question 3 of 5

• IDs are numbered in order, so a higher ID is always a newer commit.
• You can edit a commit’s message and keep its ID.
• Two people who commit identical files always get the same ID.
• A commit’s ID depends on its content, author, date, message and parent, so the same change committed twice gets two IDs.

Question 4 of 5

*   9d1f0a2 (HEAD -> main) Merge branch 'contact'
|\
| * 6b2c8e1 (contact) Add contact form
* | 3e7a4d9 Fix header spacing
|/
* 1f0c5b8 Add home page

• 6b2c8e1, because it’s the most recent commit before the merge.
• 3e7a4d9, the merge’s first parent.
• 1f0c5b8, because it’s where the two lines meet.
• None; HEAD~1 is an error on a merge commit.

Question 5 of 5

• git diff --staged
• git diff
• git log -p
• git show HEAD