6. History

Conclusion and next steps

Congratulations! You've mastered navigating and manipulating your project's history. You can now browse commits efficiently, compare changes between commits, revert specific commits, and reset your branch to a previous state.

Next, we'll dive into the world of remote repositories and collaboration on GitHub. Just one more thing before that...

Quiz time!

Quiz yourself

1/8: What command is used to view the commit history in Git?

git history

git commits

git log

git view-history

git past

2/8: How can you see the commits that affected a specific file?

git log file.txt

git status file.txt

git diff file.txt

3/8: What does git diff do when only one commit is specified?

Does nothing, it requires two commits to work

Compares the specified commit with the previous commit

Compares the specified commit with the current working directory

Complains that in the old days, developers had to compare code manually with pen and paper

4/8: What command is used to undo the changes made in a specific commit?

git undo

git rewind

git revert

git backtrack

git oopsy

5/8: When you revert a commit using git revert, what happens to the commit history?

The reverted commit is deleted from the history

The history is reset to the state before the reverted commit

Nothing changes in the commit history

A new commit is created to undo the changes

The commit history gets rewritten just like our history books

6/8: What command is used to reset a branch to a previous commit?

git restore

git reset

git revert

git switch

7/8: What does git reset do by default (without any options)?

Performs a hard reset, discarding all changes

Performs a soft reset, keeping changes in the working directory

Performs a mixed reset, unstaging changes but keeping them in the working directory

Deletes the branch being reset

Resets the entire repository to its initial state

8/8: What's the difference between git reset and git restore?

git reset can move and set the branch pointer, while git restore only restores files to the last commit

git restore can move and set the branch pointer, while git reset only restores files to the last commit

One is used for local changes, the other for remote changes

They are exactly the same, just with different names

They are very distinct and not confusing at all if your mother tongue is Finnish and you're the creator of Linux

Fantastic work! Now you're ready to collaborate with others using remote repositories on GitHub. Let's dive in!

Next step

Course preview Gitopedia Blog

Roadmap

Introduction to version control

What is version control?

Why use version control?

Introduction to Git

How Git works

Git workflow example

Conclusion and next steps

Setting up Git

Installation

Command line and terminal

The git command

Configuring Git credentials

Configuring line endings treatment

Configuring default branch name

Conclusion and next steps

Recording changes to the repository

Initializing a repository

Creating work files

Recording changes

Checking the status of the repository

Conclusion and next steps

Resetting unwanted changes

Comparing the working tree with the repository

Discarding local changes

Discarding staged changes

Amending the last commit

Conclusion and next steps

Tagging and branching

Referencing commits