How to avoid the Git police

THE GIT POLICE HOW TO AVOID

@DANNYTRANLX WHO AM I

$ GIT ADD . $ GIT COMMIT -M “WEB CHALLENGE
- ÉTS” $ GIT PUSH ORIGIN MASTER

WHAT IS GIT?

GIT IS A VERSION CONTROL SYSTEM THAT IS WIDELY USED
FOR SOFTWARE DEVELOPMENT

THE GIT HISTORY

MERGE COMMITS ARE NOISY

PROGRESS COMMITS ARE NOISY

BUT WAIT NO MERGE COMMITS? HOW TO MERGE?

GIT REBASE MASTER

GIT REBASE INTEGRATION

WHAT IS A COMMIT?

WHAT IS A COMMIT? EXACTLY?

HOW TO WRITE A COMMIT MESSAGE?

D541719 FIXED BUGS

CAPITALIZED INFINITIVE VERB, WHAT WILL IT DO TO THE FILES

81AFBCE REPLACE THE MODAL LIBRARY WITH X

81AFBCE REPLACE THE MODAL LIBRARY WITH X 018A209 REMOVE ALL
THE THINGS

81AFBCE REPLACE THE MODAL LIBRARY WITH X 018A209 REMOVE ALL
THE THINGS 6CDF507 IMPLEMENT STRIPE ENDPOINTS

700EAF0 ADDING UNIT TESTS FOR SHOPIFY D605F6C IMPLEMENT LOGIN AND
LOGOUT

7A23D03 REVERT "ADD FACEBOOK PERMISSIONS”

7A23D03 REVERT "ADD FACEBOOK PERMISSIONS” 92C1DD1 MERGE BRANCH 'MASTER' OF
GITHUB.COM:SMOOCH/SMOOCH

ANYTHING CAN BE UNDONE (ALMOST)

GIT COMMIT —AMEND

GIT COMMIT —AMEND GIT RESET HEAD~1

GIT COMMIT —AMEND GIT RESET HEAD~1 GIT ADD -P .

GIT REBASE MASTER

GIT REBASE -i

GIT REBASE -i -i FOR INTERACTIVE

➜ SMOOCH (F/STRIPE-UI-TESTS) ✗ GIT PUSH TO [email protected]:SMOOCH/SMOOCH.GIT ! [REJECTED]
F/STRIPE-UI-TESTS -> F/STRIPE-UI-TESTS (NON-FAST-FORWARD) ERROR: FAILED TO PUSH SOME REFS TO '[email protected]:SMOOCH/SMOOCH.GIT' HINT: UPDATES WERE REJECTED BECAUSE THE TIP OF YOUR CURRENT BRANCH IS BEHIND HINT: ITS REMOTE COUNTERPART. INTEGRATE THE REMOTE CHANGES (E.G. HINT: 'GIT PULL ...') BEFORE PUSHING AGAIN. HINT: SEE THE 'NOTE ABOUT FAST-FORWARDS' IN 'GIT PUSH --HELP' FOR DETAILS.

YOU SHOULD ONLY FORCE PUSH TO YOUR OWN (SOLO) BRANCH

GIT PUSH -F

GIT PUSH ORIGIN +<BRANCH>

GIT REFLOG

GIT RESET —HARD <SHA>

NOW YOU KNOW WHAT'S POSSIBLE

FEEL FREE TO ASK ME HELP

How to avoid the Git police

How to avoid the Git police

Other Decks in Programming

Featured

Transcript