GIT

Question 1

Git

Answer 1

A Version Control System for tracking changes in files and coordinating work on them in team

Question 2

Creating a repository

Answer 2

Git init

Question 3

Check for changes

Answer 3

Git status

Question 4

When there aren’t any files with changes in working directory then the directory is …..

Answer 4

Clean

Question 5

Add a file to list of tracked files

Answer 5

Git add

When we add a file to list of tracked files using git add we’re said to stage it

Question 6

When content is changed

Answer 6

The file is tracked but not staged anymore

Need to stage the file again using git add

Question 7

Add all the un-staged files in the current directory (and deeper)

Answer 7

Git add .

Question 8

When we run git add

Answer 8

Git captures a snapshot of the changes that we can make permanent by committing them to the repository

Question 9

Committing changes to repository

Answer 9

Git commit -m “message”

Question 10

Workflow

Answer 10

Make changes in the working directory
Use git add to stage them
Use git commit to save changes to repository

Question 11

Check if git is installed

Answer 11

Open terminal

Git –version

Question 12

Repository

Answer 12

Special type of directory that keeps track of the files within it

Question 13

Git status

Answer 13

Tells if the working directory is clean
Tells what files are staged and ready to be committed
Tells what files are tracked but not staged
Tells what files are untracked

Question 14

Git log

Answer 14

Git keeps track of every commit that we make

We can easily review them using git log

Question 15

Brings up the commit history, where every commit is displayed with unique hash code

Answer 15

Git log

Question 16

Pointer that point to the current commit

Answer 16

Git show HEAD

Question 17

Go back to previous commit and put the working directory back to the state it was in that time

Answer 17

Git checkout [hash code/tag]

Can use either whole hash code or first seven characters

Question 18

head detached

Answer 18

current commit isn’t the latest commit

Question 19

get back to the latest commit

Answer 19

git checkout master

Question 20

to add a tag to a commit (can help to memorize important commits)

Answer 20

git tag [parameter]

Question 21

git tag

Answer 21

display previously added tags

Question 22

allow us and others to work on different things, like features, at the same time

Answer 22

branches

Question 23

default branch of every repository

Answer 23

master branch

Question 24

git branch

Answer 24

show existing branches

Question 25

create new branch

Answer 25

git branch [name]

*indicates which branch we are on

Question 26

switch to another branch

Answer 26

git checkout [branch name]

Question 27

display logs that makes reading them a lot easier

Answer 27

git log –graph

Question 28

using ………….. we can specify what we want Git to do in a more precise way

Answer 28

flag (eg: –graph)

Question 29

view branches and divergence of commits

Answer 29

git lot –graph –all

can see all commits from all branches

Question 30

neglect unnecessary informations

Answer 30

git log –graph –all –oneline

Question 31

bring changes together

Answer 31

git merge master
switch to the branch we want to merge into
use git merge followed by the branch name we want to take the changes from

Question 32

we’ll face conflict when

Answer 32

there are versions of a file with different changes in branches we want to merge

Question 33

resolve merge conflict

Answer 33

Decide which version to keep
Open a text editor and delete the other version along with the special markings
commit the file

Question 34

merge tools

Answer 34

as the project grow, more and more merge conflicts appear. It would be great to have a tool to review and resolve them

Question 35

example merge tool

Answer 35

SemanticMerge

Question 36

clone remote repository to our local computer

Answer 36

git clone [url]

Question 37

a name that’s automatically given to a remote for which we don’t specify a name

Answer 37

origin

Question 38

see where does the remote point to

Answer 38

git remote show origin

Question 39

if the remote has changes in its branch that we want to bring to our local repository

Answer 39

git fetch [remote name by default origin] [remote branch name]

Question 40

merge the fetched changes from remote

Answer 40

git merge origin/master master

Question 41

bring a branch in our local repository up-to-date with its remote version

Answer 41

git pull origin master
fetching and merging at the same time
we should not have any uncommitted local changes before we use git pull

Question 42

get our local changes to the remote repository

Answer 42

git push origin master
pushes commits from our local repository to the remote
commit changes before we can push them to the remote

Question 43

staged

Answer 43

files are ready to be committed

Question 44

unstaged

Answer 44

files with changes that have not been prepared to be committed

Question 45

untracked

Answer 45

files aren’t tracked by git yet

Question 46

deleted

Answer 46

file has been deleted and is waiting to be removed from Git

Question 47

to remove a file from staging area

Answer 47

git reset [filename]

Question 48

add many files of the same type

Answer 48

git add ‘*.txt’

don’t forget the quotes

Question 49

see more information for each commit
where new files were added for the first time
where files were deleted

Answer 49

git log –summary

Question 50

add a remote repository

Answer 50

git remote add origin [repository url]

Question 51

tell git to remember the parameters

Answer 51

git push -u origin master

next time simply run git push

Question 52

sometimes when you go to pull you may have changes you don’t want to commit just yet. One option you have, other than committing, is to stash the changes

Answer 52

git stash
to stash your changes
git stash apply
to re-apply your changes after your pull

Question 53

take a look at what is different from our last commit

Answer 53

git diff HEAD

Question 54

………. gives you a good overview of changes you have made and lets you add files or directories one at a time and commit them separately

Answer 54

git diff –staged

staged differences

Question 55

checkout and create a branch at the same time

Answer 55

git checkout -b new_branch

Question 56

remove the actual files from disk

stage the removal of the files

Answer 56

git rm ‘*.txt’

Question 57

remove an entire folder

Answer 57

git rm -r folder_of_cats

recursively remove all folders and files from the given directory

Question 58

if you happen to delete a file without using ‘git rm’ you will find that you still have to ‘git rm’ the deleted files from the working tree

Answer 58

save this step by

git commit -am “Delete stuff”

Question 59

pull requests

Answer 59

allows the boss of the project to look through your changes and make comments before deciding to merge in the change

Question 60

merge conflicts

Answer 60

can occur when changes are made to a file at the same time. just need to decide which code to keep.

Question 61

delete a branch

Answer 61

git branch -d [branch name]
will not let you delete a branch that hasn’t been merged
can use –force (-f) option or use -D which combines -d -f together into one command

Question 62

undoing a git push

Answer 62

git push -f origin loast_known_good_commit:branch_name