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

Git For Humans - Holiday Extras - 14/08/2015

Avatar for Dan Cork Dan Cork
August 14, 2015
Technology
0
250

Git For Humans - Holiday Extras - 14/08/2015

An internal talk introducing git terminology and workflow

Avatar for Dan Cork

Dan Cork

August 14, 2015
Tweet

More Decks by Dan Cork

See All by Dan Cork
Paradox of Choice
Avatar for Dan Cork dancork
0
41
Unify The UI With React
Avatar for Dan Cork dancork
0
250
Talking Tech Jan 2016
Avatar for Dan Cork dancork
0
61
Give CSS3 Some Love / FOWD2015
Avatar for Dan Cork dancork
0
280

Other Decks in Technology

See All in Technology
Phase04_ターミナル基礎
Avatar for overflow ,Inc overflowinc
0
560
Laravelで学ぶOAuthとOpenID Connectの基礎と実装
Avatar for Koji Yoshida kyoshidaxx
4
1.5k
_Architecture_Modernization_から学ぶ現状理解から設計への道のり.pdf
Avatar for SatohJohn satohjohn
2
550
1GB RAMのラズピッピで何ができるのか試してみよう / 20260319-rpijam-1gb-rpi-whats-possible
Avatar for Akira Ouchi akkiesoft
0
660
LINEヤフーにおけるAIOpsの現在地
Avatar for LINEヤフーTech (LY Corporation Tech) lycorptech_jp
PRO
4
1.4k
欠陥分析（ODC分析）における生成AIの活用プロセスと実践事例 / 20260320 Suguru Ishii & Naoki Yamakoshi & Mayu Yoshizawa
Avatar for SHIFT EVOLVE shift_evolve
PRO
0
240
イベントで大活躍する電子ペーパー名札を作る（その２） 〜 M5PaperとM5PaperS3 〜 / IoTLT @ JLCPCB オープンハードカンファレンス
Avatar for you（@youtoy） you
PRO
0
150
Mitigating geopolitical risks with local-first software and atproto
Avatar for Martin Kleppmann ept
0
150
AWS CDK「読めるけど書けない」を脱却するファーストステップ
Avatar for Makky12 smt7174
3
210
TinyTroupeで人狼ゲームやってみた！
Avatar for ueponx ueponx
0
160
Tebiki Engineering Team Deck
Avatar for Tebiki, Inc. tebiki
0
27k
ガバメントクラウドにおけるAWSの長期継続割引について
Avatar for takeda_h takeda_h
2
5.4k

Featured

See All Featured
A designer walks into a library…
Avatar for Paul Jervis Heath pauljervisheath
210
24k
How Fast Is Fast Enough? [PerfNow 2025]
Avatar for Tammy Everts tammyeverts
3
500
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
Avatar for Irina Nazarova irinanazarova
9
1.2k
The Web Performance Landscape in 2024 [PerfNow 2024]
Avatar for Tammy Everts tammyeverts
12
1.1k
Lightning talk: Run Django tests with GitHub Actions
Avatar for Sarah Abderemane sabderemane
0
150
The Language of Interfaces
Avatar for Des Traynor destraynor
162
26k
Leveraging Curiosity to Care for An Aging Population
Avatar for Cassini Nazir cassininazir
1
200
Bridging the Design Gap: How Collaborative Modelling removes blockers to flow between stakeholders and teams @FastFlow conf
Avatar for Kenny Baas-Schwegler baasie
0
490
Why Your Marketing Sucks and What You Can Do About It - Sophie Logan
Avatar for Sophie Logan marketingsoph
0
110
How to Get Subject Matter Experts Bought In and Actively Contributing to SEO & PR Initiatives.
Avatar for Liv Day livdayseo
0
85
Ecommerce SEO: The Keys for Success Now & Beyond - #SERPConf2024
Avatar for Aleyda Solis aleyda
1
1.9k
How to optimise 3,500 product descriptions for ecommerce in one day using ChatGPT
Avatar for Katarina Dahlin katarinadahlin
PRO
1
3.5k

Transcript

  1. git for humans

  2. What is git

  3. Git is a free and open source distributed version control

    system designed to handle everything from small to very large projects with speed and efficiency. http://git-scm.com/

  4. Git is a free and open source distributed version control

    system designed to handle everything from small to very large projects with speed and efficiency. http://git-scm.com/

  5. Version Control System (VCS)

  6. Source Control Management (SCM)

  7. collection of files

  8. every change tracked

  9. who

  10. when

  11. why

  12. Mostly used for code

  13. Why do we use it

  14. simultaneous working

  15. easy to rollback

  16. multiple backups multiple locations

  17. Terminology

  18. Setting Up

  19. Repo (Repository)

  20. files & history

  21. None

  22. $ git init

  23. Remote

  24. None

  25. $ git remote

  26. origin sandbox production

  27. origin sandbox production

  28. Clone

  29. None
  30. None

  31. $ git clone {url}

  32. None
  33. None

  34. $ git remote add {alias} {url}

  35. Git is a free and open source distributed version control

    system designed to handle everything from small to very large projects with speed and efficiency.

  36. Centralised

  37. Distributed

  38. Starting Your Work

  39. Branch

  40. $ git checkout {branch}

  41. $ git checkout -b {branch}

  42. master

  43. master cool-thing

  44. $ git checkout -b cool-thing

  45. master cool-thing

  46. master cool-thing

  47. $ git checkout -

  48. $ git fetch

  49. Submitting Changes

  50. Diff

  51. $ git diff

  52. - I removed this + and added this

  53. $ git add -p

  54. Stage

  55. $ git add {file}

  56. $ git status

  57. $ git add .

  58. Commit

  59. $ git commit -m “{message}”

  60. Push

  61. $ git push {remote} {branch}

  62. $ git push {remote} {branch}:{remote- branch}

  63. Do some codings Stage changes Commit changes Push to remote

    In History Not In History

  64. Staying Up-to-date

  65. Pull

  66. $ git pull {remote} {branch}

  67. Merge

  68. master cool-thing

  69. master cool-thing

  70. $ git merge {branch}

  71. Rebase

  72. master cool-thing

  73. master cool-thing

  74. $ git rebase {branch}

  75. Conflicts

  76. <<<<<<< HEAD my code ======= someone else’s code >>>>>>> master

  77. Merge/Rebase Resolve Conflicts Stage Commit

  78. Rolling Back

  79. Before Staging

  80. $ git checkout {file}

  81. $ git checkout .

  82. Once Staged

  83. Reset

  84. $ git reset

  85. $ git reset --hard

  86. Once Committed

  87. Revert

  88. $ git revert {commit}

  89. $ git log

  90. commit abcdefghijklmnop Author: joeblogg <[email protected]> Date: Fri Aug 7 13:19:34

    2015 +0100 My super awesome change

  91. commit abcdefghijklmnop Author: joeblogg <[email protected]> Date: Fri Aug 7 13:19:34

    2015 +0100 My super awesome change

  92. Questions?