Embed Size (px)
Citation preview
GIT EMPOWERED
THE TALK IS BROKEN INTO THREE PARTS…
JMac
AGENDA
MESSING WITH COMMITSPART 1
EVERYDAY WORKFLOWSPART 2
WHEN GIT HAPPENS…PART 3
EACH PART WILL BE ROUGHLY 15 MINUTES WITH A QUICK DEMO IN BETWEEN.
JMac
AGENDA
I BELIEVE IN USING GIT VIA THE COMMAND LINE.
JMac
FORMAT
BECAUSE GIT IS POWERFUL AND IT’S BEST TO YIELD THAT POWER DIRECTLY.
JMac
FORMAT
OPEN A TERMINALUNIX BASED SYSTEM
PLEASE LEAVEWINDOWS
GIT BASHWINDOWS < 10
GIT EMPOWERED
GIT TERMINOLOGY
▸ repository or repo
▸ commit
▸ SHA or hash
▸ history or tree
▸ branch
▸ HEAD
GIT EMPOWERED
VISUALIZING THE TERMINOLOGY
commit
tree
c45fb1e
7df5edb
f88d321
be584f3
HEAD
branch
203ecc1
MESSING WITH COMMITSPART 1
add + commit
git add .
git commit -am
git add -p
git add -i
DEMO
commit --amend
commit --squash
commit --fixup
rebase -i
rebase --autosquash
GIT EMPOWERED
VISUALIZING THE COMMANDS
tree
2
3
4
1
GIT EMPOWERED
VISUALIZING THE COMMANDS
tree
2
3
4
1
fixup + squash
GIT EMPOWERED
VISUALIZING THE COMMANDS
tree
2 + 3
1
rebase --autosquash
DEMO
git cherry-pick
GIT EMPOWERED
VISUALIZING THE COMMANDS
master
203ecc1
GIT EMPOWERED
VISUALIZING THE COMMANDS
master
203ecc1
f88d321
cherry-pick
ONCE YOU’VE “SHARED” YOUR WORK, REWRITING HISTORY IS A VERY DANGEROUS THING.
JMac
AGENDA
EVERYDAY WORKFLOWSPART 2
git logo
git log --oneline
gst
git status
GIT EMPOWERED
GITHUB FLOW
master
featurebranch
GIT EMPOWERED
GITHUB FLOW
master
merge
GIT EMPOWERED
GITHUB FLOW
master
featurebranch
GIT EMPOWERED
GITHUB FLOW
master
merge
GIT EMPOWERED
GITHUB FLOW
master
featurebranch
GIT EMPOWERED
GITHUB FLOW
master
feature
rebase
GIT EMPOWERED
GITHUB FLOW
master
merge
DEMO
WHEN GIT HAPPENS…PART 3
reflog
GIT EMPOWERED
VISUALIZING THE COMMANDS
reflog
c45fb1e
7df5edb
f88d321
be584f3
bisect
WHEN ALL ELSE FAILS, JUST MAKE A BRANCH TO SERVE AS A BACKUP.
JMac
AGENDA
DEMO
QUESTIONS
FOLLOW ME ON TWITTER AND EMAIL ME FOR A COUPON FOR THE “GETTING GIT” SCREENCASTS.
JMac - @gonedark - [email protected]
THANKS
