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

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

Sponsored · SiteGround - Reliable hosting with speed, security, and support you can count on. →
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
40
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
Context Engineeringの取り組み
Avatar for nutslove nutslove
0
380
SchooでVue.js/Nuxtを技術選定している理由
Avatar for Okuto Oyama yamanoku
3
170
マネージャー視点で考えるプロダクトエンジニアの評価 / Evaluating Product Engineers from a Manager's Perspective
Avatar for hiro-torii hiro_torii
0
100
Why Organizations Fail: ノーベル経済学賞「国家はなぜ衰退するのか」から考えるアジャイル組織論
Avatar for Yasunobu Kawaguchi kawaguti
PRO
1
170
SREのプラクティスを用いた3領域同時 マネジメントへの挑戦 〜SRE・情シス・セキュリティを統合した チーム運営術〜
Avatar for coconala_engineer coconala_engineer
2
740
Kiro IDEのドキュメントを全部読んだので地味だけどちょっと嬉しい機能を紹介する
Avatar for khmoryz khmoryz
0
210
茨城の思い出を振り返る ～CDKのセキュリティを添えて～ / 20260201 Mitsutoshi Matsuo
Avatar for SHIFT EVOLVE shift_evolve
PRO
1
370
今こそ学びたいKubernetesネットワーク ～CNIが繋ぐNWとプラットフォームの「フラッと」な対話
Avatar for Takuto Nagami logica0419
3
280
Frontier Agents (Kiro autonomous agent / AWS Security Agent / AWS DevOps Agent) の紹介
Avatar for msysh msysh
3
180
顧客との商談議事録をみんなで読んで顧客解像度を上げよう
Avatar for shibayu36 shibayu36
0
280
コミュニティが変えるキャリアの地平線：コロナ禍新卒入社のエンジニアがAWSコミュニティで見つけた成長の羅針盤
Avatar for Kento Suzuki kentosuzuki
0
130
モダンUIでフルサーバーレスなAIエージェントをAmplifyとCDKでサクッとデプロイしよう
Avatar for みのるん minorun365
4
220

Featured

See All Featured
Templates, Plugins, & Blocks: Oh My! Creating the theme that thinks of everything
Avatar for Michelle Schulp Hunt marktimemedia
31
2.7k
Building a Modern Day 
E-commerce SEO Strategy
Avatar for Aleyda Solis aleyda
45
8.7k
Between Models and Reality
Avatar for mayunak mayunak
1
190
Stewardship and Sustainability of Urban and Community Forests
Avatar for Eric Wiseman pwiseman
0
110
We Analyzed 250 Million AI Search Results: Here's What I Found
Avatar for Josh Blyskal joshbly
1
750
Product Roadmaps are Hard
Avatar for C. Todd Lombardo iamctodd
PRO
55
12k
Evolution of real-time – Irina Nazarova, EuRuKo, 2024
Avatar for Irina Nazarova irinanazarova
9
1.2k
Avoiding the “Bad Training, Faster” Trap in the Age of AI
Avatar for Mike Taylor tmiket
0
79
Prompt Engineering for Job Search
Avatar for Mfonobong Umondia mfonobong
0
160
The Cult of Friendly URLs
Avatar for Andy Hume andyhume
79
6.8k
The AI Revolution Will Not Be Monopolized: How open-source beats economies of scale, even for LLMs
Avatar for Ines Montani inesmontani
PRO
3
3k
Exploring the relationship between traditional SERPs and Gen AI search
Avatar for Ray Grieselhuber raygrieselhuber
PRO
2
3.6k

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?