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

The 7 Habits of Git

Avatar for Sotaro Karasawa Sotaro Karasawa
August 27, 2013
Technology
100k
15

The 7 Habits of Git

Git 7つの心得
http://atnd.org/events/42085

Avatar for Sotaro Karasawa

Sotaro Karasawa

August 27, 2013

More Decks by Sotaro Karasawa

See All by Sotaro Karasawa
「事業目線」の正体 〜3つのフェーズのCTO経験から見えてきた、EMが持つべき視点 @ EMConf JP 2026
Avatar for Sotaro Karasawa sotarok
9
8.1k
大「個人開発サービス」時代に僕たちはどう生きるか
Avatar for Sotaro Karasawa sotarok
22
13k
P2B Haus法人サポータープランのご提案
Avatar for Sotaro Karasawa sotarok
2
1.7k
ソフトウェアxスタートアップから見た飲食と配送の世界 / The World of Food Deliverlies and Restaurant Businesses from a Software and Startup Perspective
Avatar for Sotaro Karasawa sotarok
2
1.3k
CTO 3度目の正直 / My 3rd CTO Career
Avatar for Sotaro Karasawa sotarok
21
11k
Introduction to the Corporate Solutions Engineering at MTC2018
Avatar for Sotaro Karasawa sotarok
1
36k
Mercari meetup for Corporate Engineering #1 / What is "Corporate Engineering"?
Avatar for Sotaro Karasawa sotarok
2
2.5k
Markdown and WYSIWYG
Avatar for Sotaro Karasawa sotarok
1
6.5k
20 Jan 2017 / Moving Beyond Borders - Mercari DAY
Avatar for Sotaro Karasawa sotarok
8
16k

Other Decks in Technology

See All in Technology
4人目のSREはAgent
Avatar for tanimuyk tanimuyk
0
370
フルカイテン株式会社 エンジニア向け採用資料
Avatar for FULL KAITEN fullkaiten
0
11k
ループエンジニアリングでE2Eテストを実践
Avatar for Noriyuki TAKEI noriyukitakei
0
240
AI・ロボティクスと自動化社会 / AI, Robotics, and the Automated Society
Avatar for Kenji Saito ks91
PRO
0
150
知見・人・API・DB・予算 ─ ナイナイ尽くしだった人事データ整備 with dbt、5年間の学び
Avatar for ken ken6377
1
140
デジタル・デザイン構想 by Sayaka Ishizuka
Avatar for Sayaka Ishizuka y150saya
0
180
AWS Summit の片隅で、体育座りしながらコミュニティがにぎわう理由を考えた
Avatar for Kazuki Adachi k_adachi_01
2
340
Text-to-SQLをAgentCoreで実現し、生成されるSQLの精度を定量的に評価する
Avatar for やくも yakumo
2
440
はてなのサービス基盤を支える Kubernetes《足腰》
Avatar for masayosu masayoshimaezawa
0
430
勉強会企画をアプリで構造化してみた 〜そこで見えた、AIとの付き合い方〜 / I've structured a study group plan using an app.
Avatar for Pauli pauli
0
290
感情と身体を置き去りにしない、エンジニアの生きのこり方 ──いまから、ここから「自分の状態」を扱うという選択
Avatar for saori murooka saorimurooka
1
460
グローバルチームと挑むプロダクト開発
Avatar for SansanTech sansantech
PRO
1
150

Featured

See All Featured
Side Projects
Avatar for Sacha Greif sachag
455
43k
<Decoding/> the Language of Devs - We Love SEO 2024
Avatar for Nikki Halliwell nikkihalliwell
1
270
Exploring the Power of Turbo Streams & Action Cable | RailsConf2023
Avatar for Kevin Liebholz kevinliebholz
37
6.5k
Organizational Design Perspectives: An Ontology of Organizational Design Elements
Avatar for Dr. Kim W Petersen kimpetersen
PRO
1
760
Game over? The fight for quality and originality in the time of robots
Avatar for Wayne Barker wayneb77
1
210
Design in an AI World
Avatar for tapps tapps
1
260
Google's AI Overviews - The New Search
Avatar for Barry Adams badams
0
1.1k
WENDY [Excerpt]
Avatar for Tessa Abrams tessaabrams
11
38k
Documentation Writing (for coders)
Avatar for Carmen Chung carmenintech
77
5.4k
Bash Introduction
Avatar for André Augusto Costa Santos 62gerente
615
220k
Navigating the moral maze — ethical principles for Al-driven product design
Avatar for Skipper Chong Warson skipperchong
2
400
Building an army of robots
Avatar for Kyle Neath kneath
306
46k

Transcript

  1. Crocos, Inc. Sotaro Karasawa @sotarok http://facebook.com/sotarok (JUͭͷ৺ߏ͑ #get_great_git @ (FU(SFBU(JUCZ2JJUB

  2. ࣗݾ঺հ 4PUBSP,BSBTBXB!TPUBSPL ฑ୔૱ଠ࿠ IUUQRJJUBDPNTPUBSPL גࣜձࣾΫϩίε$SPDPT*OD 1)1 (JU 3FE#VMM

  3.  (3&&Ͱ47/ˠ(JUҠߦͷϓϩδΣΫτɻ։ൃϑϩʔΛ جຊ่ͣ͞(JUͷྑ͍ॴΛ׆͔ͤΔϑϩʔ࡞Γ  HJUEBJMZϦϦʔε  $SPDPTͰ(*5-"#ಋೖ 1VMM3FRVFTUϕʔεͷ։ൃϑϩʔ΁  (JU)VC

    1SJWBUF ʹҠߦ (JUʹؔͯ͠Կ͔͍͏͜ͱ͕͋Δͱ͢Ε͹

  4. ࠓ೔࿩͢͜ͱʮ৺ߏ͑ʯ ର৅ऀ (JUॳʙதڃऀ 1VMM3FRVFTUͦΖͦΖ͔ͳͷਓ

  5. ଉΛٵ͏Α͏ʹHJUTUBUVT

  6. -JOVYͰ ͳΜ͔MTͬͯଧͪ·͢ΑͶ Ջͳ࣌

  7. ͦͷؾ࣋Ͱ HJUTUBUVT

  8. ͋ͱEJGG HJUEJGG HJUEJGGDBDIFE

  9. ͱʹ͔͘DPNNJUલʹ HJUEJGGDBDIFE

  10. HJUDPNNJUB࢖͏ͳ ͻͱͭͻͱͭ BEE͢Δͱྑ͍Ͱ͢ 47/͔Βདྷͨਓ͕ Α͘΍ͬͯΔ͖͕͢Δ

  11. ͳΜͳΒBMJBTʹ BMJBTHTUHJUTUBUVT

  12. ଉΛు͘Α͏ʹHJUCSBODI

  13. 1VMM1VTI.FSHF3FCBTF ͢΂ͯͷૢ࡞Ͱ CSBODIΛҙࣝ͠·͠ΐ͏ʂ

  14. Α͋͘Δ(JUࣄނτοϓ ʮ͍͢·ͤΜɺ ɹҧ͏ϒϥϯνʹQVTIͪ͠Ό ͍·ͨ͠ʯ

  15. ͳΜͳΒBMJBTʹ BMJBTHCHJUCSBODIB

  16. ͪͳΈʹ ϓϩϯϓτʹදࣔͤͯ͞Δ

  17. ͪͳΈʹ ϓϩϯϓτʹදࣔͤͯ͞Δ τϥϒΔਓ͸ ͍͍ͩͨݟͯ·ͤΜʂ ༉அې෺ʂ

  18. NFSHF SFCBTFΛཧղ͢Δ

  19. େࡶ೺ʹݴͬͯ Git ษڧձ@ສ༿ #3 ʹߦ͖ͬͯͨ http://gom.hatenablog.com/entry/20090522/1243011416 ૬खͷมߋΛଚॏ͠·͠ΐ͏ NFSHFࣗ෼͕ओମɻࣗ෼ͷΛݩʹ૬खͷมߋΛద༻͢Δ SFCBTF૬ख͕ओମɻ૬खͷΛݩʹࣗ෼ͷมߋΛద༻͢Δ

  20. NFSHFࣗ෼͕ओମ SFCBTF૬ख͕ओମ

  21. NFSHF ࣗ෼ ૬ख

  22. NFSHF ࣗ෼ ૬ख ࣗ෼ͷมߋʹ૬ख ͷมߋΛ͔ͿͤΔ Πϝʔδ

  23. SFCBTF ࣗ෼ ૬ख

  24. SFCBTF Πϝʔδ ࣗ෼ ૬ख

  25. SFCBTF Πϝʔδ ࣗ෼ ૬ख

  26. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  27. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  28. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  29. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  30. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख ΠϚίί

  31. SFCBTF Πϝʔδߏஙͷ༷ࢠ ࣗ෼ ૬ख

  32. SFNPUFϒϥϯν໊Λলུ͠ͳ͍

  33. ૢ࡞͸໌ࣔతʹ HJUQVTIPSJHJOGFBUVSFYYY

  34. ͻͱͭ΋͔ܽͤ·ͤΜ HJUTUBUVT HJUEJGG HJUBEE HJUEJGGDBDIFE HJUDPNNJU HJUQVTIPSJHJOGFBUVSFYYY

  35. มߋͪ͠ΌμϝͳιϨ

  36. ެ։ࡁΈͷ ྺ࢙Λ มߋͯ͠͸ ͍͚ͳ͍

  37. SFCBTF SFCBTFͱ͸ ྺ࢙Λ࠶ߏங͢Δ͜ͱ

  38. ެ։ࡁΈͱ͸ جຊతʹ͸ HJUQVTI ͨ͠΋ͷ ͞Εͨ΋ͷ

  39. ͦΕ͕Θ͔ͬͯͳ͍ͱ ଞਓ͕QVTIͨ͠΋ͷΛ DMPOF DIFDLPVU ͖ͯͯ͠ Կ͔͠ΒͷλΠϛϯάͰ HJUQVMMSFCBTF /(

  40. ·ͨ͸ ࣗ෼͕QVTIͨ͠΋ͷ ଞͷਓ͕DIFDLPVUͯ͠Δͷʹ HJUSFCBTF HJUQVTIPSJHJOGGFBUVSFYYYY

  41. SFCBTF͸ͲΜͲΜͯ͠ྑ͍͚Ͳ ศར͔ͩΒͶ commit ͷཻ౓ΛͶ ៉ྷʹͨ͠ΓͶ ͨͩ͠ɺଞͷਓͷ͜ͱΛߟ͑Δ ͜ͷ rebase ͷҙຯΛߟ͑Δ

  42. ௕͍࡞ۀ͸খϚϝʹSFCBTF

  43. DPOqJDU͸খ͍͞΄͏͕ྑ͍ ϝΠϯͱͳΔ։ൃϒϥϯν ೔ʑ rebase ͔͚·͠ΐ͏ Ϳ͔ͭΔͳΒখ͍͞͏ͪʹʂ

  44. ͖ͨͩͬ͠͞ͷ࿩ ଞਓ͕QVTIͨ͠΋ͷΛ DMPOF DIFDLPVU ͖ͯͯ͠ Կ͔͠ΒͷλΠϛϯάͰ HJUQVMMSFCBTF /(

  45. ·ͨ͸ merge ...

  46. (JU)VCͱ1VMM3FRVFTU࢖͏

  47. Git Λಋೖ͢Δ͜ͱ ʺϞμϯͰΠέͯΔ։ൃ

  48. Git ͷಋೖ ͱ͸ ։ൃϑϩʔɾۀ຿ϑϩʔͷ ࠶ߏஙͦͷ΋ͷ

  49. (JU࢖ͬͯΔͷʹ ϒϥϯν͸ͭͱ͔

  50. (JU)VC͕ͦ͜ (JUΛ࢖ͬͨ։ൃʹ͓ ͚Δ࠷ྑͷπʔϧͰ ͋Δʂ ଟ෼

  51. ౰࣌(*5-"#࢖ͬͯ·͚ͨ͠ͲͶฐࣾ όʔδϣϯ͕͋Γ·ͬͯ͘·͢Ͷ ΍ΊͯΑ͔ͬͨ

  52. 1VMM3FRVFTU ʮPull Requestʯ ͸Φʔϓϯιʔ εʹݶΒͣ࢖͑Δ༏Εͨ։ൃϑ ϩʔͩ http://d.hatena.ne.jp/sotarok/20120219/1329581585

  53. 1VMM3FRVFTU Ͱ͖Δ͚ͩ୯ҐΛখ͘͞

  54. 1VMM3FRVFTU େ͖͘ͳΓ͗͢Δ৔߹ τϐοΫϒϥϯν͔Β αϒτϐοΫͰϒϥϯνΛ੾Δ

  55. ࠷ۙ͋ͬͨେن໛։ൃ αϒτϐοΫϒϥϯν 33 branch merges 165 commits

  56. ࠷ޙʹͦͷଞͷ࿩୊

  57. 1VMM3FRVFTUຖͷ࣮ߦ؀ڥ Production = marketing.crocos.jp Pull Request #123 = pr123.dev.marketing.crocos.jp

  58. 1VMM3FRVFTUຖͷ࣮ߦ؀ڥ nginxͰ ... server_name ~^pr([^.]+).dev.([^.]+) ɹɹɹɹ\.marketing\.crocos\.jp$; set $pr_name $1; set

    $app_name $2;

  59. (JU'MPXY(JU)VC'MPX @ship @battleship

  60. ଟ෼ࢀߟʹͳΔࢿྉ

  61. ා͘ͳ͍(JU IUUQLPUBTIBUFOBCMPHKQFOUSZ  (JU#PPL IUUQHJUTDNDPNCPPLKB

  62. -FBSOJOH(JU#SBODIJOH IUUQLTXEDDMFBSO(JU#SBODIJOHKB "TVDDFTTGVM(JUCSBODIJOHNPEFMΛ ຋༁͠·ͨ͠ IUUQLFJKJOTPOZBCBOCMPHTQPUKQ TVDDFTTGVMHJUCSBODIJOHNPEFMIUNM

  63. (JUΛऔΓר͘؀ڥɺ ։ൃϑϩʔͷ࿩ ૬ஊ૭ޱΛઃ͚·ͨ͠

  64. SFDSVJU!DSPDPTDPKQ

  65. None