git glossary

19
Git glossary WTF is "fast-forward"?!

Upload: aleksandr-zhuikov

Post on 13-Jul-2015

300 views

Category:

Documents


0 download

TRANSCRIPT

Git glossaryWTF is "fast-forward"?!

ORIGIN

CLONE

MASTER

TRUNK

HEAD

CHECKOUT

ORIGIN/MASTER

FETCH

PULL

FETCH + (MERGE || REBASE)

FAST-FORWARD

ADD, COMMIT, INDEX

PUSH

MERGE

MERGE

REBASE

REBASE

DON'T REBASE COMMITS THAT

WERE PUSHED TO PUBLIC REPO!!!

CHERRY-PICK

SHA

ca82a6dff817ec66f44342007202690a93763949

ca82a

mytag-38-ca82a

RTFM

http://git-scm.com/book