Console

Question 1

show files in the current directory

Answer 1

ls (name: list. list files)

Question 2

ls - additional commands

Answer 2

• l (prints long form of file list)

- a (show all files, including hidden files)

Question 3

ls - l

Answer 3

prints long form of file list
drwxrwxr-x
r: read
w: write
x: execute

• first rwx - permissions of the creator
• second rex - permissions of a group
• last r-x - permission for everyone else

Question 4

what a folder is called in a console

Answer 4

directory

Question 5

show you your current directory

Answer 5

pwd - print working directory

Question 6

shortcut to home directory

Answer 6

~ (tilda)

Question 7

move to a different directory

Answer 7

cd - change directory

you don’t need start with a / if you are moving to relative directory from where you currently are.

if you do an absolute path, you have to start with /user…

Question 8

move up a directory level

Answer 8

cd ..

to move two levels up: cd ../..

Question 9

a program that displays the content of a file

Answer 9

less

need to hit the “q” key to exit out of the less program

Question 10

prints the contents of one or more files to the console

Answer 10

cat

Question 11

a simple text editor in the console

Answer 11

nano

shortcuts use the ^ which is actually the control button

Question 12

how to move or rename a file or directory

Answer 12

mv (move)
takes two arguments:
1) what do we want to move
2) where we want to move it

Renaming:
$ mv hello.txt hi.txt (this is same as renaming it)

Moving directories:
$ mv hi.txt documents/
(this is moving it because documents is a directory)

Question 13

represents our current directory

Answer 13

.
(dot)

$ mv documents/hi.txt .
this would move it up one directory (my current directory)

Question 14

copies a file or directory

Answer 14

cp

works the same as move -

1) what do we want to copy
2) where we want to copy it to?

for copying a directory though you have to use -r (recursive) which will copy of the document within the directory as well. example:
$ cp -r documents docs
(this will copy the documents folder and call it docs (with all of the

Question 15

removes files or directories

Answer 15

rm
be careful of using remove because there is no going back in console.

you can’t remove a directory without an -r just like copy because you need to recursively remove all of the files and sub-directories in within the directory as well

Question 16

how to create a directory (including nested directories)

Answer 16

mkdir
(make directory)

to create nested directories
use the -p documents/notes/console/part1 (the -p allows us to create as many sub directories as needed)

Question 17

repository

Answer 17

a collection of all the different versions and files of a project

Question 18

committing

Answer 18

git commit

other commit commands:
git commit -a -m

a - means that all changes to the files in the repository will be committed.

m - means that you can add the commit description message directly to the commit command

when you tell the version control system that you are done with a version and ready for the next

Question 19

create a repository

Answer 19

git init [name of project]

Question 20

how to add a file to the repository so that i can be tracked

Answer 20

git add [file name to be added to the repository]

you can also use “git .” which will stage all changes to the files in that directory.

Question 21

how to get the status of a commit

Answer 21

git status

this will show you the staging area and tell git what you want to commit (if you do or don’t want to commit all changes)

Question 22

get the history of your git repository

Answer 22

git log

(latest commits start at the TOP)

To make it on one line per commit, you can use the:

git log –pretty=oneline

Question 23

Move to (look into the details) of a commit in the repository and then return to the latest

Answer 23

To check out a previous commit

git checkout [first 5 or 6 characters of the commit number]
(note: that you can make changes here but that is dangerous.

To return to the latest versions
git checkout master (or git checkout HEAD)

• ‘master’ is the name of the default branch. By checking out a branch by name, you go to the latest version of that branch.
• if you use git checkout HEAD~! it is a special commit identifier in git; it stands for the previous commit (not the one we just made, but the one before that).

Also, the checkout command can be used to discard changes

Question 24

how to look at the difference between two commit (what has changed)

Answer 24

git diff [first commit num] [second commit nun]

Question 25

how to create a branch to work on a new feature

Answer 25

git branch [branch/feature name]

note: no “” are needed/

you need to checkout to actually move to that branch, otherwise you will stay on master

if you want to do them together you can use

$ git checkout -b [branch_name]

the b is for branch, so this will create a new branch and take you directly there (shortcut)

Question 26

what commits are included when you create a new branch?

Answer 26

the new branch will be a copy of whatever branch you are currently in (either master or a different branch you may be in)

Question 27

how to delete a branch

Answer 27

$ git -D [branch name]

you can’t delete it if you are inside of it though, you should move to the master first

Question 28

merging branches

Answer 28

go the the master branch and then:

$ git merge [branch_name]

when you merge a branch to the master, not only does it merge the latest commit of that branch, but also all other previous branch commits as well. It makes one cohesive timeline on the master

Question 29

conflicts of auto-resolvable merging

Answer 29

if there is a conflict and git can merge automatically, it will create a new commit on the master that resolves the conflicts and then merges the changes. the original branch remains unchanged and you can still check it out

Question 30

conflicts of non-auto-resolvable merging

Answer 30

the merge will tell you that there is a conflict. you can then go into the file in conflict and nano will tell you where the conflict between the two files are. you have two options:

1) remove the conflict markers and keep both changes
2) remove the conflict markets and change it to however you want it to be

Question 31

how to copy a repository and store it in another location (on same computer or remotely)

Answer 31

$ git clone [current repository name, including directory path to get to the repo] [new copied repository name]

Question 32

how are the cloned repositories connected to the master branch?

Answer 32

the cloned branch is a copy of the master branch but a new connection is added to it called remote. And the master branch is added as a remote “origin”.
You can see the remote repositories by running:
$ git remote
which will give you a list of the remote repos

the master branch remains unchanged though unless you run the:
$ git remote add [a name you want to call the existing clone] [the branch you want to add, including the directory/network location]

Question 33

how to send the changes from a branch on a remote repo to another repository?

Answer 33

$ git push [repository name you want to add it to] [new name of the branch to be added to the repository that you will be pushing to]

if you don’t provide a repository name, then it will assume that it is origin

if the branch you are pushing to another repository doesn’t exist there, you have to create a new branch on that repository

Question 34

how to update a remote repo with the changes from the origin or other repo

Answer 34

$ git pull [origin or other repo name] [branch you want to pull in changes from from the other repo]

Question 35

conflicts from pulls

Answer 35

open file in conflict and resolve

Question 36

How to you unstage changes for a commit?

Answer 36

Git reset

Question 37

How do you save and exit from GIT_EDITOR?

Answer 37

Look up answer!

Question 38

Shortcut for adding all the changes to the files in the current directory and below?

Answer 38

git add .

But since it adds everything, it’s a really good idea t check the gig status before doing a add ., just to make sure you don’t add any file that is not intended.

Question 39

Git shortcut (custom added to the .gitconfig file in the home directory)

Answer 39

co - checkout
ci - commit
st - status
br - branch
hist- log (with fancy display)
type - cat-file -t
dump - cat-file -p

Question 40

How to tag previous commits with customer names and view in the history/log all of the tag names on all commits:
git hist master –all

Answer 40

git tag [tag name ie v1 or v1-beta]

A shortcut to move to the commit prior to) a certain tag:
git commit v1^

The ^ moves it to the parent commit

Question 41

How to revert local changes before they have been put on staging

Answer 41

git checkout [file name]

Question 42

How to undo local changes after out on staging but before committing

Answer 42

git reset HEAD [filename]
git checkout [filename]

You can do git checkout to confirm if changes have been reverted (and the actual file itself)

Question 43

How to undo committed changes

Answer 43

git revert HEAD [optionally the tag name or hash if you are going back more than just one commit]
This will create a new commit with the one immediately before

Git revert reset –hard [tag or hash value of the commit you want to revert to]
This will allow you to jump to a specific commit and the other branches that you jumped over will no longer appear in history (unless you use git log –all)

git tag -d [tag name]
This will remove it completely so that git log -a will also not show it. This will delete it (signaled for garbage collecting)

Question 44

How to amend a file a file from the previous commit?

Answer 44

git commit –amend -m “[commit message]”

This erases the previous commit with changes (similar to reverting to the previous and then replacing it)

Question 45

How to move a repository file (and track in git)

Answer 45

mkdir [new directory name]
git mv [filename] [new location]

Git status will show you it was created to new location and the file in the original location was deleted

Alternatively:
mkdir [new directory]
mv [filename] [directory]
git add [directory/filename]
git rm [filename]

Question 46

what is the lowest level of the command line directory?

Answer 46

Root. simply / (the hard drive)

Question 47

how to save and exit the text editor in terminal (VIM)

Answer 47

hit “esc” then :wq (w for write and q for quit)

alternatively, you can just to :x

Question 48

what is Forking?

Answer 48

A means for getting a personally owned repository that you wouldn’t have direct write access to. Flow for forking:

1) Fork from owner’s Repo
2) Get the HTTP address from new Fork
3) git clone [HTTP address] [Name of Clone]
4) git branch [branch name]
5) make changes and commit them
6) push the changes back to the new Forked repo with: git push -u origin [branch name]
7) enter credentials
8) Look for new branch in branch list
9) Pull request button appears (context sensitive) and it starts the process of offering this branch to the master repository
10) Identify where you want the branch to be added (mast for example), and from where it is coming from (your new branch)

Question 49

What is a pull request?

Answer 49

providing the changes you have made on a named branch back to a repository that you forked from but don’t have direct write access to

Question 50

how to make a comma separated string of the items in an array

Answer 50

array.join(“,”);