From https://www.educative.io/

Question 1

How do you know which git repo is the main source?

Answer 1

All git repos are the same.
There is no concept no a central server that hold the “golden” source.
Instead, we maintain our own source. A server or host may be in charge but fundamentally they are all the same.

Question 2

What are the 4 phases a file tracked by git will go through?

Answer 2

This image is missing some arrows, what are they?

Question 3

Make cards for overall workflow for:

installing

Connecting

backing up

pushing

pulling

starting new

etc

Question 4

What does git status do?

Answer 4

Displays the state of the repo and staging area

Gives info on whether a file has been changed or staged

Question 5

What does git log do?

Answer 5

gives a log of commits

can use –graph to see branching

use –all to see all branches

Question 6

Add and commit changes in one message (only for already tracked files)

Answer 6

git commit -a

Question 7

What happens if you do and do not use the -m with a commit?

Answer 7

With, looks for a message within quotation marks

without it opens nano and you can type the message there

Question 8

See the specific changes (not just whether a file has changed)

Answer 8

git diff

Question 9

Clone a repo from the harddrive

Clone a repo from github

Answer 9

git clone folderName targetfoldername (don’t git init first)

git clone https://github.com/ianmiell/shutit (don’t git init first)

Question 10

What does git reset do?

What flag does it use by default

Answer 10

unstages files

–mixed

Question 11

What does git reset –hard do?

Answer 11

Reverts files on your computer to the last commit

Question 12

Revert files on your computer to the last commit

Answer 12

git reset –hard

Question 13

unstage a single file

unstage all files

Answer 13

git reset filenameanddirectory

git reset –mixed

Question 14

View log but only the title

Answer 14

git log –oneline

Question 15

view branching log

Answer 15

git log –graph

Question 16

create a new branch at head

Answer 16

git branch branchname

Question 17

show all branch names

Answer 17

git branch

Question 18

view all branches in log

Answer 18

git log –graph –all

Question 19

The head can point to branch tag but not to arbitrary commits

t or f

Answer 19

f

it can point to arbitrary commits as a floating head

Question 20

A branch is the same as a tag

t or f

Answer 20

f

branches also have a history

tags do not

but are otherwise the same

Question 21

View all tags

Answer 21

git tag

Question 22

create a tag where the head is

create a tag somewhere else

Answer 22

git tag tagname

git tag tagname pointername (works with 6e3574ba4ff1b53dcbf776c6613037b156bc2e30)

Question 23

A branch is just a pointer

t or f

A tag is just a pointer

t or f

Answer 23

T

Question 24

Tags and branches can both maintain a branch as logged in git log

t or f

Answer 24

t

tags do it too apparently

Question 25

History info is lost in detatched head if you don’t have a pointer

t or f

Answer 25

f

it’s not lost it’s just not displayed by git log anymore

If you type in the commit code it will display

Question 26

Merge two branches

Answer 26

git merge branchname

Question 27

What does git merge attempt to do?

What if there are conflicts?

Answer 27

there are two branches, they have some common ancestor, merging takes all the changes from the common ancestor to the branch end and attempts to apply it to the head branch.

it makes all changes and automatically commits it all

If there are conflicts, add flags –no-ff –no-commit

It copies new files into the working directory and stages them

Changes files it adds new lines of code into old files (in a specific format) for the user to work through. It does not stage them.

Question 28

If there are conflicts on the same line of code, what happens?

Answer 28

You decide. Git pauses.

Question 29

How do you handle conflicts?

Answer 29

There are different workflows

Fix one of the files and commit with that one

Can leave the mess (but easy to forget it’s there)

Question 30

What happens if you try to commit when you haven’t worked through conflicting files?

Answer 30

It will stop you.

Question 31

How do you commit if you don’t want to work through conflicts yet?

Answer 31

Add the files.

You can commit with un

Question 32

What’s a pull request

Answer 32

A pull request – also referred to as a merge request – is an event that takes place in software development when a contributor/developer is ready to begin the process of merging new code changes with the main project repository.

Question 33

Save changes you’ve made without making a commit

Answer 33

git stash

Question 34

Load your stashed files

Answer 34

gish stash pop

Question 35

What happens to conflicts when popping?

Answer 35

Same as conflicts in merging. creates a file showing both versions

Question 36

Can you commit with unstaged popped files?

Answer 36

no

Question 37

How do you stash again for different changes?

Answer 37

It adds it to the stack of stashes

when you stash pop, it only deals with the top level

Question 38

How do you show the actual changes for a stash?

Answer 38

For most recent files:

git stash show

For more recent changes:

git stash show -p

For specific:

git stash show -p stash@{0}

git stash show –patch stash@{0}

–patch - to show what’s changes

Question 39

How do you ‘load’ a state from the middle of a stash stack?

Answer 39

git stash apply stash@{1}

git stash drop stash@{1}