Upgrade to Pro — share decks privately, control downloads, hide ads and more …

Git, Unicorns and Rainbows

88b8138397e1d1441f4e4a54348bde09?s=47 ubermuda
October 27, 2011
Technology
3
140

Git, Unicorns and Rainbows

A small compilation of some git jaw dropping features

88b8138397e1d1441f4e4a54348bde09?s=128

ubermuda

October 27, 2011
Tweet

More Decks by ubermuda

See All by ubermuda
La théorie des graphes appliquée à Git
88b8138397e1d1441f4e4a54348bde09?s=48 ubermuda
0
280
Comment Docker révolutionne le web
88b8138397e1d1441f4e4a54348bde09?s=48 ubermuda
3
610
Vers des applications twelve-factor
88b8138397e1d1441f4e4a54348bde09?s=48 ubermuda
2
700
Git et la théorie des graph
88b8138397e1d1441f4e4a54348bde09?s=48 ubermuda
3
820
Introduction à Docker
88b8138397e1d1441f4e4a54348bde09?s=48 ubermuda
6
760
Meetup Docker 101
88b8138397e1d1441f4e4a54348bde09?s=48 ubermuda
1
180
A multi-container Symfony2 setup with Docker
88b8138397e1d1441f4e4a54348bde09?s=48 ubermuda
40
12k
Docker Introduction
88b8138397e1d1441f4e4a54348bde09?s=48 ubermuda
5
360
Symfony 2, un framework robuste et moderne
88b8138397e1d1441f4e4a54348bde09?s=48 ubermuda
5
160

Other Decks in Technology

See All in Technology
Salesforce女子部-権限についてまとめてみたその１
F95794a2051e510588225c20afb7e3b2?s=48 sfggjp
0
180
プロダクトグロースと技術のベースアップを両立させるRettyのアプリ開発スタイル / Achieve Product Growth and Tech Update
1a74617b91d2757b839b9cf3614648ce?s=48 imaizume
1
260
msal.jsのあれこれ
716a39e2ee383722f960c17467eaf55b?s=48 takas0522
0
1.4k
Power BI ”を” 可視化しよう！
0cc2ebc5781bcb2cae5f9ab7efa40ff2?s=48 hanaseleb
0
140
技術広報の役割を定義してみた 2022年春
E2b467a18ec383cfa0068207e43df7fa?s=48 afroscript
3
2.3k
Learning from AWS Customer Security Incidents [2022]
A431674e1b362e40786876211b77455e?s=48 ramimac
0
450
モデリング、コンテキスト トランジション +1 / Data modeling
966e29b84ae7dbde170f66b0bc75b7a6?s=48 ishiayaya
0
110
⚡Lightdashを試してみた
2c6a9bc003b77685330cc9359b6fbbc4?s=48 k_data_analyst
0
130
220428event_ogura_part
E55fbffb4afd0a84d36c945ed68d8c19?s=48 caddi_eng
0
180
一人から始めるプロダクトSRE / How to start SRE in a product team, all by yourself
12a5cec7a54018170b1a009731acf477?s=48 vtryo
4
2.3k
#BabylonJS5 の祭ツイートまとめ Let's take a look at what people create with the latest #BabylonJS5
617bd4a28ec6cbc877c752a1b4e29e58?s=48 chomado
0
600
Building smarter apps with machine learning, from magic to reality
7e6a435700dda6cdb22105d601f20892?s=48 picardparis
4
3.1k

Featured

See All Featured
Designing for Performance
245cee81a9c424266e5e401d844ea881?s=48 lara
596
63k
It's Worth the Effort
Ba530e786553390f3fb271848485681c?s=48 3n
172
25k
The Art of Programming - Codeland 2020
719435d98d452de7ac367c828266cf01?s=48 erikaheidi
31
5.8k
What the flash - Photography Introduction
5ce91fa49a613cbc3e20d5f96856473f?s=48 edds
61
9.8k
Optimizing for Happiness
25c7c18223fb42a4c6ae1c8db6f50f9b?s=48 mojombo
365
63k
Designing Experiences People Love
1b75d89772b7eea1f6c89fbf362607d9?s=48 moore
130
22k
What's in a price? How to price your products and services
Dad095ea7038f89f760419ce475d5d14?s=48 michaelherold
229
9.3k
We Have a Design System, Now What?
95d9f37115fbb0d13135d0f77132f856?s=48 morganepeng
35
2.9k
10 Git Anti Patterns You Should be Aware of
Dafc4723e9a1c067796c0fec6f509774?s=48 lemiorhan
638
52k
Let's Do A Bunch of Simple Stuff to Make Websites Faster
8081b26e05bb4354f7d65ffc34cbbd67?s=48 chriscoyier
498
130k
Rebuilding a faster, lazier Slack
C0b42577cfc2b321be3474618107e933?s=48 samanthasiow
62
7.2k
RailsConf & Balkan Ruby 2019: The Past, Present, and Future of Rails at GitHub
C44e1f7e22c3f23cff7bc130871047ef?s=48 eileencodes
119
28k

Transcript

  1. Git, Unicorns and Rainbows Geoffrey Bachelet — KnpLabs Wednesday, September

    21, 11

  2. Not your average git talk Wednesday, September 21, 11

  3. Ready? Wednesday, September 21, 11

  4. Forgot something in your commit? Wednesday, September 21, 11

  5. git --amend Wednesday, September 21, 11

  6. git --amend • Add files to a commit • Remove

    files from a commit • Change a commit’s message Wednesday, September 21, 11

  7. Partially commit a file? Wednesday, September 21, 11

  8. git add -p Wednesday, September 21, 11

  9. git add -p • Stage only the chunks of diff

    you want • Intelligent chunking (chunk more!) • Manual chunk edit Wednesday, September 21, 11

  10. Tweak your commit history before pushing? Wednesday, September 21, 11

  11. git rebase -i Wednesday, September 21, 11

  12. git rebase -i • Change commits order • Edit commits

    (just like commit --amend) • Squash commits together Wednesday, September 21, 11

  13. Internet just went down? Wednesday, September 21, 11

  14. Work locally! Wednesday, September 21, 11

  15. Work locally! • Commit • Create / merge branches •

    What you can’t do: push and fetch Wednesday, September 21, 11

  16. Want to create a shitload of branches? Wednesday, September 21,

    11

  17. Branches are cheap as fuck. Wednesday, September 21, 11

  18. Branches are cheap • A branch is just a ref

    to a commit • That is, a 40 bytes file • Containing a sha1 Wednesday, September 21, 11

  19. Woops, I should have branched that? Wednesday, September 21, 11

  20. It’s never too late. Wednesday, September 21, 11

  21. It’s never too late • Mark your current commit •

    Switch back to previous branch • Reset to branch start-point Wednesday, September 21, 11

  22. The build is broken? Wednesday, September 21, 11

  23. git bisect Wednesday, September 21, 11

  24. git bisect • Tell git a commit for which the

    build works • And a commit for which it’s broken • It will find the commit that breaks! Wednesday, September 21, 11

  25. You commited your database password? Wednesday, September 21, 11

  26. git filter-branch Wednesday, September 21, 11

  27. git filter-branch • Crawls your history • Runs commands on

    it • And voila! Wednesday, September 21, 11