git

Question 1

Check what is waiting to be pushed

Answer 1

git status, OR:

git push –dry-run

Question 2

Pull all branches

Answer 2

git pull –all

Question 3

Switch to branch

Answer 3

git checkout branch

Question 4

Merge from master to current branch, do commit

Answer 4

git merge master

Question 5

Squash commits interactively

Answer 5

git rebase --interactive
Opens vim. Read instructions.
To change: i . edit first words in line as desired
To exit change mode: esc
To save and exit vim: :wq

Question 6

Commit with message

Answer 6

git commit -m “msg”

Question 7

Undo last commit, leave changes in working dir

Answer 7

git reset HEAD~1

Question 8

Undo last commit, delete from working dir

Answer 8

git reset –hard HEAD~1

Question 9

Fix last commit message

Answer 9

git commit -amend

Question 10

Create a ‘negative’ of a commit that is already pushed

Answer 10

git revert [commit id] –no-commit

by default revert commits this negative

Question 11

Add file to staging

Answer 11

git add [path]

Question 12

Delete file from git

Answer 12

git rm [path]

Question 13

Undo uncommitted changes

Answer 13

git checkout , OR

git reset HEAD

Question 14

Cherry pick to current branch

Answer 14

git cherry-pick [commit id]

Question 15

Merge to current branch without commit

Answer 15

git merge –no-commit

Question 16

Reset types

Answer 16

• -soft: discard last commit, leave in staging area,
• -mix: discard last commit and add, leave in working folder,
• -hard: discard last commit, add and any changes to HEAD

Question 17

Show remote names

Answer 17

git remote

Question 18

What is the diff between pull and fetch?

Answer 18

pull = fetch + merge

Question 19

Add remote

Answer 19

git remote add [shortname] [url]

Question 20

Create branch

Answer 20

git checkout -b iss53

This is shorthand for:
git branch iss53
git checkout iss53

Question 21

Global option to rebase when pulling

Answer 21

git config –global pull.rebase “true”

Question 22

Pull from a specified remote

Answer 22

git pull [options] [remote name]

Question 23

What is a ‘bare’ repo?

Answer 23

A Git repository that has no working directory

Question 24

What is the diff between pull and fetch?

Answer 24

pull = fetch + merge

Question 25

Show local branches

Answer 25

git branch

Question 26

Show remote branches

Answer 26

git branch -r

Question 27

Show all branches

Answer 27

git branch -a

Question 28

Create branch

Answer 28

git checkout -b iss53

This is shorthand for:
git branch iss53
git checkout iss53

Question 29

Show remotes - name+url

Answer 29

git remote -v

Question 30

Add remote

Answer 30

git remote add [shortname] [url]

When you clone, a remote named ‘origin’ is automatically added

Question 31

Fetch specific remote

Answer 31

git fetch [remote name]

Question 32

Push to remote

Answer 32

git push [remote name] [branch]

Question 33

Rename remote

Answer 33

git remote rename [old] [new]

Question 34

Remove remote

Answer 34

git remote remove [name]

Question 35

Create branch

Answer 35

git branch abcd + git checkout abcd
OR:
git checkout -b abcd

Question 36

Create a negative of a commit or commit range - to undo pushed changes

Answer 36

git revert HEAD~2..HEAD