Git/ Github

Question 1

What is a repository?

Answer 1

A central location where the project is being kept and where changes will be tracked.

Question 2

In programming: What is a trunk?

Answer 2

The master branch of our project in the repository. The most stable and recent versions of our project resides.

Question 3

In programming: What is the term ‘Staging a file’ mean?

Answer 3

Telling the source control system about the files within the repository we create.

Question 4

In programming: What is the term ‘commit’?

Answer 4

A snapshot of your program

Question 5

In programming: What does creating a new branch mean?

Answer 5

Branching away from the master branch so we can work on a new feature or bug fix without the risk of breaking something in our master branch.

Question 6

Terminal: git status

Answer 6

list which (unstaged) filed have changed

Question 7

Terminal: git diff

Answer 7

list (unstaged) changes to files

Question 8

Terminal: git log

Answer 8

list recent commits

Question 9

Terminal: git add fn

Answer 9

stage file

Question 10

Terminal: git commit -m ‘message’

Answer 10

commit file

Question 11

Terminal: git commit -am ‘message’

Answer 11

add/commit all changes from all tracked file (no untracked files) in one go.

Question 12

Terminal: git reset filename

Answer 12

unstage file

Question 13

Terminal: commit –amend -m ‘message’

Answer 13

alter the last commit (add any staged files, new comment)

Question 14

Terminal: git reset –soft HEAD^

Answer 14

undo previous commit, put changes in staging

Question 15

Terminal: git reset –hard HEAD^

Answer 15

Undo last commit and all changes

Question 16

Terminal: git reset –hard HEAD^^

Answer 16

Undo two (^^) last commits and all changes

Question 17

Terminal: git checkout – cats.html index.html

Answer 17

Undo all changes that were made to files cats.html and index.html

Question 18

Terminal: git rebase –onto \^ HEAD

Answer 18

remove specific commit from repository. the \ in ^ is just an escape char to make zsh play nice and is not necessary if using bash.

Question 19

git remote add origin git@example.com:example/petshop.git

Answer 19

add a remote repository

Question 20

git push -u origin master

Answer 20

push current local repo to remote. -u sets it to default for the future

Question 21

git remote -v show

Answer 21

show the available remote repositories that have been added

Question 22

git pull

Answer 22

checkout and merge remote changes in one go

Question 23

git fetch origin

Answer 23

update the local cache of the remote repository

Question 24

git remote -v update

Answer 24

bring remote refs up to date (and -v show which branches were updated)

Question 25

git status -uno

Answer 25

will tell you whether the branch you are tracking is ahead, behind or has diverged. If it says nothing, the local and remote are the same.

Question 26

git show-branch *master

Answer 26

will show you the commits in all of the branches whose names end in master (eg master and origin/master).

Question 27

git show remote origin

Answer 27

show localremote branch tracking and sync status

Question 28

git log HEAD..origin/master --oneline

Answer 28

shows commit messages

Question 29

git diff HEAD..origin/master

Answer 29

shows all changes on remote compared to local HEAD

Question 30

git branch

Answer 30

list currently existing branches

Question 31

git branch [branchname]

Answer 31

create new branch

Question 32

git checkout branchname

Answer 32

move to that branch

Question 33

git checkout -b branchname

Answer 33

create and checkout new branch in one go

Question 34

git branch -d branchname

Answer 34

remove branch

Question 35

git checkout master; git merge branchname;

Answer 35

conditions for fast-forward merge - nothing new on master between branch start/end points

Question 36

git fetch origin``git branch -r

Answer 36

list remote branches (after a fetch)

Question 37

git push origin :branchname

Answer 37

delete remote branch 'branchname'

Question 38

git remote prune origin

Answer 38

clean up deleted remote branches (let's say someone else deleted a branch on the remote)

Question 39

git show remote origin

Answer 39

show localremote branch tracking and sync status (duplicate info under "remote repositories")

Question 40

git push heroku yourbranch:master

Answer 40

simple form

Question 41

git push heroku-staging staging:master

Answer 41

(localBranchName:remoteBranchName)

Question 42

git tag

Answer 42

list all tags

Question 43

git checkout v0.0.1

Answer 43

checkout code

Question 44

git tag -a v0.0.3

Answer 44

-m 'Version 0.0.3' add new tag

Question 45

git push --tags

Answer 45

push new tags to remote