Index

B

branch

C

commit

G

git checkout --ours file-to-checkout git checkout --theirs file-to-checkout git checkout -b my_new_branch origin/<branch> git checkout < branchname > git checkout <ref> -- file1/to/restore file2/to/restore git checkout <ref>~1 -- file1/to/restore file2/to/restore git clean git commit --amend git commit --amend -m "new message" git fetch origin

git log [option] git merge --abort git merge origin/<branch> git pull origin <branch-to-pull> git push <remote-name> <branch-name> git push origin HEAD git push origin HEAD:integration git reflog git reset [option] [<ref>] git stash list git stash save "message here"

H

HEAD

M

merge

merge conflict merging

O

origin

R

remote

S

snapshot

T

The three states