Git Empowered

•

2 gefällt mir•375 views

Jason McCreary

Slides from my talk at PHP[world] 2016 to help you feel empowered when running Git commands.

Technologie

THE TALK IS BROKEN INTO THREE
PARTS…
JMac
AGENDA

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

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

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

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

GIT EMPOWERED
GITHUB FLOW
master
feature
branch

GIT EMPOWERED
GITHUB FLOW
master
feature
rebase

GIT EMPOWERED
VISUALIZING THE COMMANDS
reflog
c45fb1e
7df5edb
f88d321
be584f3

WHEN ALL ELSE FAILS, JUST MAKE A
BRANCH TO SERVE AS A BACKUP.
JMac
AGENDA

FOLLOW ME ON TWITTER AND EMAIL ME
FOR A COUPON FOR THE “GETTING GIT”
SCREENCASTS.
JMac - @gonedark - jason@pureconcepts.net
THANKS

Weitere ähnliche Inhalte

Andere mochten auch

Presentation Bulgaria PHPAlena Holligan

Dip Your Toes in the Sea of SecurityJames Titcumb

Code Coverage for Total Security in Application MigrationsDana Luther

Php extensionsElizabeth Smith

SunshinePHP 2017 - Making the most out of MySQLGabriela Ferrara

Conscious CouplingCiaranMcNulty

Modern sqlElizabeth Smith

Intermediate OOP in PHPDavid Stockton

200K+ reasons security is a mustMichelangelo van Dam

PHP World DC 2015 - What Can Go Wrong with Agile Development and How to Fix ItMatt Toigo

Enough suffering, fix your architecture!Luís Cobucci

Website Accessibility: It’s the Right Thing to doDesignHammer

Automating Your Workflow with Gulp.js - php[world] 2016Colin O'Dell

Kicking off with Zend Expressive and Doctrine ORM (Sunshine PHP 2017)James Titcumb

Debugging Effectively - SunshinePHP 2017Colin O'Dell

Getting instantly up and running with Docker and SymfonyAndré Rømcke

How I started to love design patternsSamuel ROZE

Redis for your bossElena Kolevska

A World Without PHPBen Marks

How We Got Here: A Brief History of Open SourceChris Tankersley

Andere mochten auch (20)

Presentation Bulgaria PHP

Dip Your Toes in the Sea of Security

Code Coverage for Total Security in Application Migrations

Php extensions

SunshinePHP 2017 - Making the most out of MySQL

Conscious Coupling

Modern sql

Intermediate OOP in PHP

200K+ reasons security is a must

PHP World DC 2015 - What Can Go Wrong with Agile Development and How to Fix It

Enough suffering, fix your architecture!

Website Accessibility: It’s the Right Thing to do

Automating Your Workflow with Gulp.js - php[world] 2016

Kicking off with Zend Expressive and Doctrine ORM (Sunshine PHP 2017)

Debugging Effectively - SunshinePHP 2017

Getting instantly up and running with Docker and Symfony

How I started to love design patterns

Redis for your boss

A World Without PHP

How We Got Here: A Brief History of Open Source

Ähnlich wie Git Empowered

Gitting betterGregory Bataille

Git in 10 minutesSafique Ahmed Faruque

Git from the trenchesNuno Caneco

Git For The Android DeveloperEffective

GIT_In_90_Minutesvimukthirandika

Keep your GIT history cleantomasbro

Git hub abduallah abu nadaLama K Banna

Ähnlich wie Git Empowered (7)

Gitting better

Git in 10 minutes

Git from the trenches

Git For The Android Developer

GIT_In_90_Minutes

Keep your GIT history clean

Git hub abduallah abu nada

Mehr von Jason McCreary

BDD in iOS with CedarJason McCreary

All Aboard for Laravel 5.1Jason McCreary

Patterns, Code Smells, and The Pragmattic ProgrammerJason McCreary

Cache, Workers, and QueuesJason McCreary

From CakePHP to LaravelJason McCreary

21 Ways to Make WordPress FastJason McCreary

Configuring WordPress for Multiple EnvironmentsJason McCreary

Mehr von Jason McCreary (8)

BDD in iOS with Cedar

All Aboard for Laravel 5.1

Patterns, Code Smells, and The Pragmattic Programmer

Cache, Workers, and Queues

From CakePHP to Laravel

21 Ways to Make WordPress Fast

Configuring WordPress for Multiple Environments

Kürzlich hochgeladen

08448380779 Call Girls In Friends Colony Women Seeking MenDelhi Call girls

Factors to Consider When Choosing Accounts Payable Services Providers.pptxKatpro Technologies

Enhancing Worker Digital Experience: A Hands-on Workshop for PartnersThousandEyes

Transforming Data Streams with Kafka Connect: An Introduction to Single Messa...HostedbyConfluent

Kotlin Multiplatform & Compose Multiplatform - Starter kit for pragmaticscarlostorres15106

Tech-Forward - Achieving Business Readiness For Copilot in Microsoft 3652toLead Limited

04-2024-HHUG-Sales-and-Marketing-Alignment.pptxHampshireHUG

08448380779 Call Girls In Civil Lines Women Seeking MenDelhi Call girls

Azure Monitor & Application Insight to monitor Infrastructure & ApplicationAndikSusilo4

[2024]Digital Global Overview Report 2024 Meltwater.pdfhans926745

Transcript: #StandardsGoals for 2024: What’s new for BISAC - Tech Forum 2024BookNet Canada

#StandardsGoals for 2024: What’s new for BISAC - Tech Forum 2024BookNet Canada

Install Stable Diffusion in windows machinePadma Pradeep

How to Remove Document Management Hurdles with X-Docs?XfilesPro

Salesforce Community Group Quito, Salesforce 101Paola De la Torre

GenCyber Cyber Security Day PresentationMichael W. Hawkins

My Hashitalk Indonesia April 2024 PresentationRidwan Fadjar

Benefits Of Flutter Compared To Other FrameworksSoftradix Technologies

From Event to Action: Accelerate Your Decision Making with Real-Time AutomationSafe Software

Understanding the Laravel MVC ArchitecturePixlogix Infotech

Kürzlich hochgeladen (20)

08448380779 Call Girls In Friends Colony Women Seeking Men

Factors to Consider When Choosing Accounts Payable Services Providers.pptx

Enhancing Worker Digital Experience: A Hands-on Workshop for Partners

Transforming Data Streams with Kafka Connect: An Introduction to Single Messa...

Kotlin Multiplatform & Compose Multiplatform - Starter kit for pragmatics

Tech-Forward - Achieving Business Readiness For Copilot in Microsoft 365

04-2024-HHUG-Sales-and-Marketing-Alignment.pptx

08448380779 Call Girls In Civil Lines Women Seeking Men

Azure Monitor & Application Insight to monitor Infrastructure & Application

[2024]Digital Global Overview Report 2024 Meltwater.pdf

Transcript: #StandardsGoals for 2024: What’s new for BISAC - Tech Forum 2024

#StandardsGoals for 2024: What’s new for BISAC - Tech Forum 2024

Install Stable Diffusion in windows machine

How to Remove Document Management Hurdles with X-Docs?

Salesforce Community Group Quito, Salesforce 101

GenCyber Cyber Security Day Presentation

My Hashitalk Indonesia April 2024 Presentation

Benefits Of Flutter Compared To Other Frameworks

From Event to Action: Accelerate Your Decision Making with Real-Time Automation

Understanding the Laravel MVC Architecture

Git Empowered

1. GIT EMPOWERED

4. THE TALK IS BROKEN INTO THREE PARTS… JMac AGENDA

5. MESSING WITH COMMITS PART 1

6. EVERYDAY WORKFLOWS PART 2

7. WHEN GIT HAPPENS… PART 3

8. EACH PART WILL BE ROUGHLY 15 MINUTES WITH A QUICK DEMO IN BETWEEN. JMac AGENDA

9. I BELIEVE IN USING GIT VIA THE COMMAND LINE. JMac FORMAT

10. BECAUSE GIT IS POWERFUL AND IT’S BEST TO YIELD THAT POWER DIRECTLY. JMac FORMAT

11. OPEN A TERMINAL UNIX BASED SYSTEM

12. PLEASE LEAVE WINDOWS

13.

14. GIT BASH WINDOWS < 10

15. GIT EMPOWERED GIT TERMINOLOGY ▸ repository or repo ▸ commit ▸ SHA or hash ▸ history or tree ▸ branch ▸ HEAD

16. GIT EMPOWERED VISUALIZING THE TERMINOLOGY commit tree c45fb1e 7df5edb f88d321 be584f3 HEAD branch 203ecc1

17. MESSING WITH COMMITS PART 1

18. add + commit

19. git add .

20. git commit -am

21.

22. git add -p

23. git add -i

24.

25. DEMO

26. commit --amend

27. commit --squash

28. commit --fixup

29. rebase -i

30. rebase --autosquash

31. GIT EMPOWERED VISUALIZING THE COMMANDS tree 2 3 4 1

32. GIT EMPOWERED VISUALIZING THE COMMANDS tree 2 3 4 1 fixup + squash

33. GIT EMPOWERED VISUALIZING THE COMMANDS tree 2 + 3 1 rebase --autosquash

34. DEMO

35. git cherry-pick

36. GIT EMPOWERED VISUALIZING THE COMMANDS master 203ecc1

37. GIT EMPOWERED VISUALIZING THE COMMANDS master 203ecc1 f88d321 cherry-pick

38. ONCE YOU’VE “SHARED” YOUR WORK, REWRITING HISTORY IS A VERY DANGEROUS THING. JMac AGENDA

39. EVERYDAY WORKFLOWS PART 2

40. git logo

41. git log --oneline

42. gst

43. git status

44. GIT EMPOWERED GITHUB FLOW master feature branch

45. GIT EMPOWERED GITHUB FLOW master merge

46. GIT EMPOWERED GITHUB FLOW master feature branch

47. GIT EMPOWERED GITHUB FLOW master merge

48.

49. GIT EMPOWERED GITHUB FLOW master feature branch

50. GIT EMPOWERED GITHUB FLOW master feature rebase

51. GIT EMPOWERED GITHUB FLOW master merge

52. DEMO

53. WHEN GIT HAPPENS… PART 3

54.

55. reflog

56. GIT EMPOWERED VISUALIZING THE COMMANDS reflog c45fb1e 7df5edb f88d321 be584f3

57. bisect

58.

59. WHEN ALL ELSE FAILS, JUST MAKE A BRANCH TO SERVE AS A BACKUP. JMac AGENDA

60. DEMO

61. QUESTIONS

62. FOLLOW ME ON TWITTER AND EMAIL ME FOR A COUPON FOR THE “GETTING GIT” SCREENCASTS. JMac - @gonedark - jason@pureconcepts.net THANKS

Git Empowered

Empfohlen

Empfohlen

Weitere ähnliche Inhalte

Andere mochten auch

Andere mochten auch (20)

Ähnlich wie Git Empowered

Ähnlich wie Git Empowered (7)

Mehr von Jason McCreary

Mehr von Jason McCreary (8)

Kürzlich hochgeladen

Kürzlich hochgeladen (20)

Git Empowered