Module 3

Question 1

How to clone a repository from Github’s site?

Answer 1

git clone <URL>

Question 2

How to commit all files change in the working tree in one step?

Answer 2

git commit -a -m "insert commit message"

Question 3

git config --global credential.helper cache allows us to configure the credential helper, which is used for …what?

Answer 3

Allowing automated login to GitHub.

I provide credentials once and then will not have to do it again for a limited time period.

Question 4

Name the command that gathers all the snapshots we’ve taken and sends them to the remote repository.

Answer 4

git push

Question 5

What does git remote -v do?

Answer 5

Shows the URLs for fetch and pull associated with remote origin.

Question 6

How can I check if my local repo is out of sync with a remote repo?

Answer 6

git remote show origin

Out of date = commits made that aren’t incl. in my local repo

Question 7

What’s the main difference between git fetch and git pull?

Answer 7

git fetch fetches remote updates but doesn’t merge; git pull fetches remote updates and merges.

Question 8

What is does git remote show origin do?

Answer 8

It shows additional information on the remote repository. By default, git call the remote repo as origin.

Question 9

If we want to make a change to a remote branch, what must we do?

Answer 9

Pull the remote branch, merge it with the local branch, then push it back to its origin.

Question 10

Interpret the output from the command git remote show origin shown below

Answer 10

“Local out of date” tells me that my local repo is out of sync with the remote repo, meaning someone pushed changes (commits) after I pulled info from the remote repo.

Question 11

Is the following statement true or false?

Git keeps remote (origin) and local branches in sync at all times

Answer 11

False. I can check sync status through git remote show origin and sync by doing git pull or git push

Question 12

What does git fetch do? What is the purpose of using it?

Answer 12

Fetch commits from remote repo and copy them to my remote branch.
As it download to the remote branches instead of my local branches, it won’t disrupt my work.
I can use git checkout to switch my working tree from local to remote branch.

Question 13

Interpret the screenshot below

Answer 13

Both git log origin/master and git status show me that my local master branch is out of sync to origin/master, namely, it is 1 commit behind it

I will need to do git merge origin/master from my local master branch.

Question 14

Interpret the screenshot below

Answer 14

Local master and remote origin/master branches are in sync.

Question 15

What should you do with the conflict markers shown below when resolving a merge conflict?

Answer 15

Remove all of the conflict markers and only leave the code as it should be after the merge.

Question 16

How do you switch to a new local branch?

Answer 16

git checkout -b <branch name>

Question 17

What does “git rebase refactor” do?

Answer 17

Move the current branch on top of the refactor branch

Question 18

What command would we use to change the base of the current branch?

Answer 18

git rebase <branchname>

Question 19

If you’re making changes to a local branch while another user has also made changes to the remote branch, which command will trigger a merge?

Answer 19

git pull

Question 20

What is one reason for using rebase instead of merge?

Answer 20

When I want to keep a linear commit history.

Question 21

If there is a new branch on the remote repo that I am not currently tracking, how can I start tracking it on my local repo?

Answer 21

git checkout <branch_name>

Question 22

In order to get the contents of a remote branch without automatically merging, which of these commands should we use?

Answer 22

git remote update

Question 23

If we need to find more information about a remote branch, which command will help us?

Answer 23

git remote show origin

Question 24

What command will download remote branches from remote repositories without merging the content with your current workspace automatically?

Answer 24

git fetch

Question 25

What type of merge creates a new merge commit?

Answer 25

An explicit merge

Fast-forward is a type of implicit merge

Question 26

What method of getting remote contents will automatically merge the remote branch with the current local branch?

Answer 26

git pull

Question 27

What is the origin in Git?

Answer 27

origin is an alias for the URL of a remote from which a repo was originally cloned.

Git associates a remote URL with a name, and your default remote is usually called origin

When you do a git clone <url>, url is automatically added to your local repo under the name origin.

Question 28

What happens when I run the following command
git push origin <branch name>

Answer 28

It means push everything from my local master to the remote named origin.

The structure of this command is, of course, more general - the more general form is git push -u <remote> <branch>, which will push the branch named branch to the designated remote, creating it at the far end if the remote doesn’t already have it (that’s what the -u flag does).

Question 29

What is a remote repository?

Answer 29

Remote repositories are versions of your project that are hosted on the Internet or network somewhere.

https://git-scm.com/book/ms/v2/Git-Basics-Working-with-Remotes