git ch. 0-3

Question 1

What is git?

Answer 1

Command-line tool for managing version control.

Light, efficient, safe/easy recovery, open source.

Question 2

What is a git repository?

Answer 2

History of project’s versions, files, branches.

Question 3

What is a commit in git?

Answer 3

History of snapshots of your project.

Contains file contents, metadata, parent pointer(s), and unique commit ID hash.

Question 4

What is the structure of commit history?

Answer 4

Forms a directed acyclic graph (DAG).

Question 5

Where is the git repository stored?

Answer 5

Stored locally.

Question 6

What is the working directory in git?

Answer 6

Where you directly interact with project files. Looks like local version of project.

Modifying a file will move it from unchanged to changed working directory.

Question 7

What does ‘git add’ do?

Answer 7

Stages changes. Moves things from working directory to staging area.

Question 8

What is the staging area in git?

Answer 8

Where changes are prepared before committing.

Also known as the index.

Question 9

What does ‘git commit’ do?

Answer 9

Saves snapshot and moves it from staging area to committed history. Moves head pointer to most recent commit.

Question 10

What is the relationship between working directory, staging area, and committed history?

Answer 10

Working directory -> git add -> staging area -> git commit -> committed history.

Question 11

What does HEAD represent in git?

Answer 11

Current working branch.

Question 12

What is the purpose of ‘git switch’?

Answer 12

Causes HEAD to point to a targeted branch.

Question 13

What is a detached head state?

Answer 13

When HEAD points to a specific commit instead of a branch.

Question 14

What is a source branch?

Answer 14

Branch with new changes.

Question 15

What is a target branch?

Answer 15

Branch being merged into (e.g., main).

Must switch to this branch first.

Question 16

What is a fast forward merge?

Answer 16

Linear path of commit history. Source branch hasn’t diverged from target branch.

Question 17

What is a merge commit?

Answer 17

Diverged path where both source and target have new commits.

Creates new commit with 2 parent commits.

Question 18

What indicates conflicting changes in a merge conflict report?

Answer 18

««««<, ===========,&raquo_space;»»»»».

Question 19

How can you see which files have conflicts?

Answer 19

Use ‘git status’.

Question 20

What does ‘git help [command]’ do?

Answer 20

Provides help for the specified command.

Question 21

What does ‘git config’ do?

Answer 21

Tells git what your name and email is.

git config –global user.name “name”. (the –global indicates that this is applied to all projects)

Question 22

What does ‘git init’ do?

Answer 22

Turns directory into git repository.

Question 23

What does ‘git status’ show?

Answer 23

Shows branch, commits, untracked files, tracked files.

Question 24

What does ‘git log’ do?

Answer 24

View repo commits, outputs each commit’s id hash, author, date, and message.

Question 25

What does 'git log --graph --oneline' do?

Answer 25

Visualizes commit history with branch relationships.

Question 26

What does 'git stash' do?

Answer 26

Temporarily stashes away changes to focus on other tasks or branches.

Question 27

What does 'git stash pop' do?

Answer 27

Recovers stash changes to current working directory.

Question 28

What does 'git restore' do?

Answer 28

Undo file change.

Question 29

# you missed this on your first qz00 try What does 'git restore --staged [file]' do?

Answer 29

Unstage changed file.

Question 30

What does 'git checkout [commit hash] -- [file]' do?

Answer 30

recovers a file from its previous commit

Question 31

What does 'git checkout [commit hash]' do?

Answer 31

temporarily view or test a specific commit without creating a new branch | this is in a detached head state

Question 32

What does 'git checkout [branch]' do?

Answer 32

Switches to specific branch.

Question 33

What does 'git checkout -b [new branch name]' do?

Answer 33

Creates and switches to new branch.

Question 34

What does 'git branch' do?

Answer 34

Create, list, delete branches. ## Footnote git branch -c [name] creates. git branch lists. git branch -d [name] deletes.

Question 35

What does 'git branch -d' do?

Answer 35

Safe delete merged branches.

Question 36

What does 'git switch' do?

Answer 36

Switch between branches.

Question 37

What does 'git switch --create [branch name]' do?

Answer 37

Creates and switches to new branch.

Question 38

What does 'git merge' do?

Answer 38

Combine changes from one branch into another.

Question 39

What does 'git merge --abort' do?

Answer 39

Cancel merge and return to pre-merge conflict state.

Question 40

echo [message] >> [file]

Answer 40

appends text to file contents without overwriting

Question 41

git restore [file]

Answer 41

gets rid of changes in working directory for the file

Question 42

what are the different ways to create branches?

Answer 42

git switch -c [branch name] OR git checkout -b [branch name]. git branch [name].

Question 43

git config --list

Answer 43

verifies current configuration. shows all variables in config file, like user.name and user.email

Question 44

what are branches, conceptually

Answer 44

pointers to commits that update as new commits are added (depending on HEAD)