github

Question 1

Version

Answer 1

git –version

Question 2

Workflow

Answer 2

1. git add .
2. git commit -m [message]
3. git push

Question 3

check status of files

Answer 3

git status

Question 4

Staging unstaged or untracked files

Answer 4

git add filename

git add dirname

git add .

Question 5

committing staged files

Answer 5

git commit -m “message.”

Question 6

What does SSH stand for?

Answer 6

Secure shell

Question 7

checking for ssh file in project

Answer 7

in git bash:

ls -a -l ~/.ssh

Question 8

checking for ssh file in project

Answer 8

in git bash:

ls -a -l ~/.ssh

Question 9

How to generate an SSH key

Answer 9

in git bash, in the root directory:

ssh-keygen -t rsa -b 4096 -C “email address”

Question 10

Concerning ssh keys, how can you get the ssh pid?

Answer 10

in git bash:

eval “$(ssh-agent -s)”

Question 11

How to register ssh key or file?

Answer 11

in git bash:

ssh-add ~/.ssh/id_rsa

Question 12

How to view current remote origins

Answer 12

git remote -v

Question 13

How to remove a remote origin or destination

Answer 13

git remote rm origin

git remote rm destination

Question 14

How to add a remote origin?

Answer 14

git remote add origin git@github.com:accountname/reponame

Question 15

How to push repository to github?

Answer 15

git push -u origin master

Question 16

How to acces the key of an .ssh file?

Answer 16

in git bash:

cat ~/.ssh/id_rsa.pub

Question 17

How to test ssh connection?

Answer 17

in git bash:

ssh -T git@github.com

Question 18

How to push to heroku?

Answer 18

git push heroku master

Question 19

SSH key workflow

Answer 19

1. check for existing key: ls -a -l ~/.ssh
2. Generate a key: ssh-keygen -t rsa -b 4096 -C “email
   address”
3. Check if keygen was succesful: eval “$(ssh-agent -s)”
4. Register key: ssh-add ~/.ssh/id_rsa
5. Access key in file: cat ~/.ssh/id_rsa.pub
6. Setup SSH with provider
7. Test connection: ssh -T git@github.com

Question 20

General Git workflow

Answer 20

1. git add .
2. git commit -m “message.”
3. git push origin master

Question 21

How to clone a specific branch

Answer 21

git clone –single-branch –branch

Question 22

Difference between git clone and git pull?

Answer 22

git clone is how you get a local copy of an existing repository to work on. It’s usually only used once for a given repository, unless you want to have multiple working copies of it around. (Or want to get a clean copy after messing up your local one…)

git pull (or git fetch + git merge) is how you update that local copy with new commits from the remote repository. If you are collaborating with others, it is a command that you will run frequently.

Question 23

Difference between clone, pull, fork, and push

Answer 23

git clone means you are making a copy of the repository in your system.

git fork means you are copying the repository to your Github account.

git pull means you are fetching the last modified repository.

git push means you are returning the repository after modifying it.

In layman’s term:

git clone is downloading and git pull is refreshing.

Question 24

How to see a list of git commits?

Answer 24

git log

Question 25

How to clone a git repository into a manually named directory?

Answer 25

git clone [url] [dirName]

Question 26

How can we display only the commits of log messages?

Answer 26

git log --oneline

Question 27

git log flag that shows which files have changed

Answer 27

git log --stat

Question 28

Which log flag show exactly which changes have been made

Answer 28

git log -p or git log --patch

Question 29

How to see a specific commit

Answer 29

git log [SHA] -p git show [SHA]

Question 30

Do's and Don'ts for commit messages

Answer 30

Do - do keep the message short (less than 60-ish characters) - do explain what the commit does (not how or why!) Do not -do not explain why the changes are made (more on this below) -do not explain how the changes are made (that's what git log -p is for!) -do not use the word "and" if you have to use "and", your commit message is probably doing too many changes - break the changes into separate commits e.g. "make the background color pink and increase the size of the sidebar" The best way that I've found to come up with a commit message is to finish this phrase, "This commit will...". However, you finish that phrase, use that as your commit message. Above all, be consistent in how you write your commit messages!

Question 31

Which command can be used to see changes that have been made but haven't been committed, yet?

Answer 31

git diff

Question 32

How to display tags

Answer 32

git tag

Question 33

how to delete a tag

Answer 33

git tag -d [tag name] git tag --delete [tag name]

Question 34

How to add a tag

Answer 34

git tag -a [tag name] (the stands for annotate)

Question 35

How to create a new branch

Answer 35

git branch [branchName]

Question 36

How to move the head pointer to a specific branch

Answer 36

git checkout [branchName]

Question 37

How do we delete a branch?

Answer 37

git branch -d [branchName]

Question 38

How to add a branch at a specific commit?

Answer 38

git branch [branchName] [SHA-abreviated]

Question 39

How to create a new branch and check it out at the same time?

Answer 39

by useing the -b flag git checkout -b [branchName]

Question 40

How to see logs of all branches at the same time

Answer 40

git log --oneline --decorate --graph --all

Question 41

How to merger a branch with the master branch

Answer 41

git merge [branchName]

Question 42

How to undo a merge?

Answer 42

git reset --hard HEAD^

Question 43

How to ammend the most recent commit message

Answer 43

git commit --amend

Question 44

How to undo file changes that has been committed?

Answer 44

git revert [sha]

Question 45

Reset vs Revert

Answer 45

At first glance, resetting might seem coincidentally close to reverting, but they are actually quite different. Reverting creates a new commit that reverts or undos a previous commit. Resetting, on the other hand, erases commits!

Question 46

Relative Commit References

Answer 46

You already know that you can reference commits by their SHA, by tags, branches, and the special HEAD pointer. Sometimes that's not enough, though. There will be times when you'll want to reference a commit relative to another commit. For example, there will be times where you'll want to tell Git about the commit that's one before the current commit...or two before the current commit. There are special characters called "Ancestry References" that we can use to tell Git about these relative references. Those characters are: ^ – indicates the parent commit ~ – indicates the first parent commit Here's how we can refer to previous commits: the parent commit – the following indicate the parent commit of the current commit HEAD^ HEAD~ HEAD~1 the grandparent commit – the following indicate the grandparent commit of the current commit HEAD^^ HEAD~2 the great-grandparent commit – the following indicate the great-grandparent commit of the current commit HEAD^^^ HEAD~3 The main difference between the ^ and the ~ is when a commit is created from a merge. A merge commit has two parents. With a merge commit, the ^ reference is used to indicate the first parent of the commit while ^2 indicates the second parent. The first parent is the branch you were on when you ran git merge while the second parent is the branch that was merged in.

Question 47

How to delete a recent commit

Answer 47

git reset git reset HEAD^

Question 48

Flags for git reset

Answer 48

- -mixed (default) (moves commit to working directory) - -soft (moves commit to staging index) - -hard (moves commit directly to trash)

Question 49

How to make a backup of branch before attempting to reset it, and then restor the backup?

Answer 49

git branch backup then when need to restor simple checkout the master and git merge backup

Question 50

How to pull remote repo down to local computer?

Answer 50

git pull origin master

Question 51

When would you use git fetch instead of git pull?

Answer 51

When you dont want to automatically merge the local branch with the tracking branch. Git pull automatically does a forward merge with tracking branch

Question 52

What if there the remote is several commits ahead of the local repo and there are some commits in the local repo that has not yet been pushed up to the remote?

Answer 52

git fetch origin master git merge origin/master git push origin master

Question 53

what is git fork

Answer 53

git fork, makes a identical copy of a repo after which you become the owner of that copy

Question 54

How to see a short list of commits by individual contributers?

Answer 54

git shortlog

Question 55

Which flags can be added to git shortlog?

Answer 55

git shortlog displays an alphabetical list of names and the commit messages that go along with them. If we just want to see just the number of commits that each developer has made, we can add a couple of flags: -s to show just the number of commits (rather than each commit's message) and -n to sort them numerically (rather than alphabetically by author name).

Question 56

how to filter logs by a particular author

Answer 56

git log --author=Surma

Question 57

How to find a commit that references a particular term?

Answer 57

git log --grep=[term]

Question 58

Workflow for contributing to other developers repos

Answer 58

1. fork repo 2. clone to working directory 3. check-out new branch 4. commit changes 5. push to forked repo

Question 59

how to setup an upstream repo

Answer 59

git remote add upstream [url]

Question 60

How to rename remotes

Answer 60

git remote rename mine origin

Question 61

How to combine a number of commits into one larger commit?

Answer 61

git rebase example: git rebase -1 HEAD~3 NB: before squashing commits, you should first create a backup branch

Question 62

Rebase commands

Answer 62

use p or pick – to keep the commit as is use r or reword – to keep the commit's content but alter the commit message use e or edit – to keep the commit's content but stop before committing so that you can: add new content or files remove content or files alter the content that was going to be committed use s or squash – to combine this commit's changes into the previous commit (the commit above it in the list) use f or fixup – to combine this commit's change into the previous one but drop the commit message use x or exec – to run a shell command use d or drop – to delete the commit